more consistency changes