adding fixes to snapshot