Fixes to make save as working.