Java to Kotlin converter: minor corrections after code review