Minor tweaks to scripts