Minor changes to roles