Update to Kotlin 1.5
Some improvements