Final fixes to checker