Fixed autosaving with save states