Fix role management