More scipting fixes
Add fixes