Minor updates to script execution