Fix basic roles functionality