Small fixes for snapshots in eventd and dispatcher