Tweak SAVE command in server