Fix more bindings