Roles and Profiles fix-up