3098-rolesDefinition, fixing minor bugs