Minor fixes to comply with updated Code Checker