Exam bug fixes