Autosave fix and autosize fix