Tweaks to scripts