Some fixesfor the roles rename.