Few fixes for the bindings