Merge "Fix Kotlin warnings"