More fixes for language bindings