More consistency checker fixes