More work on CheckConsistency