Updated to synchronize with recent proctorserv changes