Updated to latest Kotlin