Final fix roles