Minor changes of snapshot / restore scripts