sync2: fix some more issues with making snapshots
sync2: fix some more issues with making snapshots

DrXyzzy/smc,sagemathinc/smc,DrXyzzy/smc,sagemathinc/smc,tscholl2/smc,tscholl2/smc,DrXyzzy/smc,sagemathinc/smc,sagemathinc/smc,tscholl2/smc,tscholl2/smc,tscholl2/smc,DrXyzzy/smc