add more inconsistency fixes