Minor tweaks to EventManager.save