diff --git a/rsbac/adf/reg/reg_main.c b/rsbac/adf/reg/reg_main.c
index de803a463356..d785276388f9 100644
--- a/rsbac/adf/reg/reg_main.c
+++ b/rsbac/adf/reg/reg_main.c
@@ -15,7 +15,6 @@
 #include <linux/kernel.h>
 #include <linux/version.h>
 #include <linux/module.h>
-#include <asm/uaccess.h>
 #include <linux/seq_file.h>
 #include <rsbac/types.h>
 #include <rsbac/reg.h>
diff --git a/rsbac/data_structures/um_data_structures.c b/rsbac/data_structures/um_data_structures.c
index addf159e01fa..464e7a61eb07 100644
--- a/rsbac/data_structures/um_data_structures.c
+++ b/rsbac/data_structures/um_data_structures.c
@@ -1176,33 +1176,36 @@ int rsbac_um_add_gm(rsbac_list_ta_number_t ta_number,
 	}
 #ifdef CONFIG_RSBAC_UM_EXCL
 	if (!rsbac_um_no_excl) {
-        	rsbac_gid_t gid = RSBAC_GEN_GID(RSBAC_UID_SET(user),
-					group);
-
-		if (!rsbac_ta_list_exist
-		    (ta_number, user_handle, &user)) {
+               rsbac_gid_t gid = RSBAC_GEN_GID(RSBAC_UID_SET(user), group);
+		if (!rsbac_ta_list_exist(ta_number, user_handle, &user)) {
 #ifdef CONFIG_RSBAC_UM_VIRTUAL
 			if (RSBAC_UID_SET(user))
 				rsbac_printk(KERN_INFO "rsbac_um_add_gm(): uid %u/%u not known to RSBAC User Management!\n",
 				     RSBAC_UID_SET(user), RSBAC_UID_NUM(user));
-		else
-#endif
-			rsbac_printk(KERN_INFO "rsbac_um_add_gm(): uid %u not known to RSBAC User Management!\n",
+                        else
+                                rsbac_printk(KERN_INFO "rsbac_um_add_gm(): uid %u not known to RSBAC User Management!\n",
 				     RSBAC_UID_SET(user));
+#else
+                        rsbac_printk(KERN_INFO "rsbac_um_add_gm(): uid %u not known to RSBAC User Management!\n",
+				     RSBAC_UID_SET(user));
+#endif
 			return -RSBAC_ENOTFOUND;
-		}
-		if (!rsbac_ta_list_exist
-		    (ta_number, group_handle, &gid)) {
+                }
+
+		if (!rsbac_ta_list_exist(ta_number, group_handle, &gid)) {
 #ifdef CONFIG_RSBAC_UM_VIRTUAL
-			if (RSBAC_GID_SET(gid))
+			if (RSBAC_GID_SET(gid)) 
 				rsbac_printk(KERN_INFO "rsbac_um_add_gm(): gid %u/%u not known to RSBAC User Management!\n",
 				     RSBAC_GID_SET(gid), group);
-		else
-#endif
-			rsbac_printk(KERN_INFO "rsbac_um_add_gm(): gid %u not known to RSBAC User Management!\n",
-				     group);
-			return -RSBAC_ENOTFOUND;
-		}
+                        else
+                                rsbac_printk(KERN_INFO "rsbac_um_add_gm(): gid %u not known to RSBAC User Management!\n",
+			             group);
+#else
+                        rsbac_printk(KERN_INFO "rsbac_um_add_gm(): gid %u not known to RSBAC User Management!\n",
+			             group);
+#endif                        
+                        return -RSBAC_ENOTFOUND;
+                }
 	}
 #endif
 	rsbac_pr_debug(aef_um, "pid %u(%s): adding user %u group %u\n",