Some fixes around the roles