Add question-mark for getters, fix some type conversion.