Some Admin RoleManager fixes