Continuing to fix staff placement bugs