Fix issues with file save / file save as