More thorough consistency checks