Fixing error messages and bindings