Fixing issues introduced (and caught in test suite) when convertng the object to script