Akshay: Minor changes to snapshot stuff