More inconsistency fixes.