Three small fixes to work around our bindings generator limitations