Fix type of getters