Some improvments in decompiling class files

We need them to Kotlin-Java interoperability