diff --git a/src/common/RewindManager.cxx b/src/common/RewindManager.cxx
index 70010ee0f..89db90102 100644
--- a/src/common/RewindManager.cxx
+++ b/src/common/RewindManager.cxx
@@ -267,8 +267,7 @@ string RewindManager::saveAllStates()
       out.putString(state.message);
       out.putLong(state.cycles);
 
-      if (i < numStates)
-        unwindStates(1);
+      unwindStates(1);
     }
     // restore old state position
     rewindStates(numStates - curIdx);
diff --git a/src/gui/DeveloperDialog.cxx b/src/gui/DeveloperDialog.cxx
index 9e35a2663..28d50d5a4 100644
--- a/src/gui/DeveloperDialog.cxx
+++ b/src/gui/DeveloperDialog.cxx
@@ -583,7 +583,7 @@ void DeveloperDialog::addDebuggerTab(const GUI::Font& font)
 #if defined(DEBUGGER_SUPPORT) && defined(WINDOWED_SUPPORT)
   // Debugger is only realistically available in windowed modes 800x600 or greater
   // (and when it's actually been compiled into the app)
-  if(ds.w < 800 || ds.h < 600);  // TODO - maybe this logic can disappear?
+  if(ds.w < 800 || ds.h < 600)  // TODO - maybe this logic can disappear?
   {
     myDebuggerWidthSlider->clearFlags(Widget::FLAG_ENABLED);
     myDebuggerHeightSlider->clearFlags(Widget::FLAG_ENABLED);