Varous inconsistency fixes