Fix more getters and a few typos