Last set of consistency changes.