Fixing types of added getters