Keypress save and autosave fix