Fixed Scala bindings