Fixes after update Kotlin