fixes on the roles