diff --git a/src/Menus.cpp b/src/Menus.cpp
index 0623cf381..18979dde7 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -297,7 +297,6 @@ void AudacityProject::CreateMenusAndCommands()
 
 #ifdef EXPERIMENTAL_FTP
       c->AddSeparator();
-
       c->AddItem(wxT("Upload File"), _("&Upload File..."), FN(OnUpload));
 #endif
 
@@ -2770,14 +2769,16 @@ void AudacityProject::OnExit()
    QuitAudacity();
 }
 
-void AudacityProject::OnUpload()
-{
-   //if (mTags->ShowEditDialog(this, wxT("Edit ID3 Tags (for MP3 exporting)")))
-   //   PushState(wxT("Edit ID3 Tags"), wxT("Edit ID3 Tags"));
+#ifdef EXPERIMENTAL_FTP
+   void AudacityProject::OnUpload()
+   {
+      //if (mTags->ShowEditDialog(this, wxT("Edit ID3 Tags (for MP3 exporting)")))
+      //   PushState(wxT("Edit ID3 Tags"), wxT("Edit ID3 Tags"));
 
-   UploadDialog dlog(this);
-   dlog.ShowModal();
-}
+      UploadDialog dlog(this);
+      dlog.ShowModal();
+   }
+#endif
 
 void AudacityProject::OnExportLabels()
 {
diff --git a/src/Menus.h b/src/Menus.h
index be08d83ed..25adce548 100644
--- a/src/Menus.h
+++ b/src/Menus.h
@@ -181,7 +181,9 @@ void OnExportMultiple();
 void OnExportLabels();
 void OnExportMIDI();
 
-void OnUpload();
+#ifdef EXPERIMENTAL_FTP
+   void OnUpload();
+#endif
 
 void OnPreferences();
 
diff --git a/src/Project.cpp b/src/Project.cpp
index dc3e2330b..0c32029e0 100644
--- a/src/Project.cpp
+++ b/src/Project.cpp
@@ -2922,9 +2922,7 @@ bool AudacityProject::Save(bool overwrite /* = true */ ,
                            bool bWantSaveCompressed /*= false*/) 
 {
    if (bWantSaveCompressed) 
-   {
       wxASSERT(fromSaveAs);
-   }
    else
    {
       TrackListIterator iter(mTracks);
diff --git a/src/Project.h b/src/Project.h
index 9a71c98eb..e96ea49fb 100644
--- a/src/Project.h
+++ b/src/Project.h
@@ -107,7 +107,11 @@ class ImportXMLTagHandler : public XMLTagHandler
 
    virtual bool HandleXMLTag(const wxChar *tag, const wxChar **attrs);
    virtual XMLTagHandler *HandleXMLChild(const wxChar *tag) { return NULL; };
-   virtual void WriteXML(XMLWriter &xmlFile) { wxASSERT(false); } //vvv todo
+   
+   // Don't want a WriteXML method because ImportXMLTagHandler is not a WaveTrack. 
+   // <import> tags are instead written by AudacityProject::WriteXML.
+   //    virtual void WriteXML(XMLWriter &xmlFile) { wxASSERT(false); } 
+
  private: 
    AudacityProject* mProject;
 };