Fixes save and load events