Fixes for Kotlin M5.3