Fix staff role / staff mapping