[#6100] Small fixes for snapshot script