Allow skipping of uploading of snapshot
Make sure we fire off waiting things