Fix some getters