Merge "Small fixes for Kotlin 2." into main