Previewbuildscript fixes