Save event fixes