Bindings tweaks