Checker fixes