Fixed new consistency checks