fixes some bugs in event save