Fixes to origami bindings