Fix cmd-s save