Tweaks to snapshot version logic