Tweaks to snapshot script