More consistency changes