Minor tweaks to sync_events