Roles assignment fixes