diff --git a/src/Menus.cpp b/src/Menus.cpp
index 78d4ffcf6..9b9505fdf 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -1200,9 +1200,6 @@ void AudacityProject::CreateMenusAndCommands()
 
    mLastFlags = 0;
 
-   mSel0save = 0;
-   mSel1save = 0;
-
 #if defined(__WXDEBUG__)
 //   c->CheckDups();
 #endif
@@ -3671,7 +3668,7 @@ void AudacityProject::OnPasteNewLabel()
       for (Track *t1 = iter1.First(); t1; t1 = iter1.Next()) {
          if (t1->GetSelected()) {
             // Look for a label track
-            while ((t1 = iter1.Next())) {
+            while (0 != (t1 = iter1.Next())) {
                if (t1->GetKind() == Track::Label) {
                   t = t1;
                   break;
diff --git a/src/Project.cpp b/src/Project.cpp
index 9be0e8815..eab022685 100644
--- a/src/Project.cpp
+++ b/src/Project.cpp
@@ -727,6 +727,8 @@ AudacityProject::AudacityProject(wxWindow * parent, wxWindowID id,
                                  const wxPoint & pos,
                                  const wxSize & size)
    : wxFrame(parent, id, wxT("Audacity"), pos, size),
+     mSel0save(0.0),
+     mSel1save(0.0),
      mLastPlayMode(normalPlay),
      mRate((double) gPrefs->Read(wxT("/SamplingRate/DefaultProjectSampleRate"), AudioIO::GetOptimalSupportedSampleRate())),
      mDefaultFormat((sampleFormat) gPrefs->