save event fixes