snapshot fixes