Fixes for staff join.