Fixed few bugs resulting in snapshots not being replicated