Hackathon fixes

That was my original intention, but overriding them (or one of them, has to try it again) caused compilation errors on kotlin side. Probably needs more investigation