Bug fixes for loading/saving with null fileName