Fixes to event saving