diff --git a/src/debugger/Debugger.cxx b/src/debugger/Debugger.cxx
index a8641a9b0..ef8119ee6 100644
--- a/src/debugger/Debugger.cxx
+++ b/src/debugger/Debugger.cxx
@@ -449,7 +449,7 @@ bool Debugger::rewindState()
   mySystem.clearDirtyPages();
 
   unlockBankswitchState();
-  bool result = r.rewindEmulationState();
+  bool result = r.rewindState();
   lockBankswitchState();
 
   myDialog->rewindButton().setEnabled(!r.empty());
diff --git a/src/gui/GuiObject.hxx b/src/gui/GuiObject.hxx
index 7c8aff1de..a9a5cc42f 100644
--- a/src/gui/GuiObject.hxx
+++ b/src/gui/GuiObject.hxx
@@ -95,8 +95,8 @@ class GuiObject : public CommandReceiver
     /** Redraw the focus list */
     virtual void redrawFocus() { }
 
-    /** special character for menues */
-    const string& ELLIPSIS = "\x1d";
+    /** Special character for menues */
+    const string ELLIPSIS = "\x1d";
 
   protected:
     virtual void releaseFocus() = 0;