fix roles and dates