Fix bindings using references