Fixed some getters