Made a few more consistency changes