Improve 'save' and 'save as...' performance