Start of fixing consistency checker
Changes to have the consistency checker build and run