Fix consistency checks