Loader and autosave fixes