Few issues related to snapshotting fixed.