Exports related fixes and some extra bindings