Some consistency changes