Several changes in checker.cpp