Modifying roles to avoid OrganizationalEntity constraint violation issues.