Workscript fixes