diff --git a/src/lay/layMacroEditorDialog.cc b/src/lay/layMacroEditorDialog.cc
index 3702b2592..6d31a3309 100644
--- a/src/lay/layMacroEditorDialog.cc
+++ b/src/lay/layMacroEditorDialog.cc
@@ -1626,7 +1626,7 @@ MacroEditorDialog::current_tab_changed (int index)
   searchEditBox->clear ();
   apply_search ();
 
-  update_ui_to_run_mode ();
+  do_update_ui_to_run_mode ();
 }
 
 lay::Macro *MacroEditorDialog::create_macro_here (const char *prefix)
@@ -2735,7 +2735,7 @@ MacroEditorDialog::start_exec (gsi::Interpreter *ec)
     f->second->exec_model ()->set_run_mode (true);
   }
 
-  update_ui_to_run_mode ();
+  do_update_ui_to_run_mode ();
 }
 
 void
@@ -2760,7 +2760,7 @@ MacroEditorDialog::end_exec (gsi::Interpreter *ec)
     f->second->exec_model ()->set_run_mode (false);
   }
 
-  update_ui_to_run_mode ();
+  do_update_ui_to_run_mode ();
 }
 
 
@@ -2965,7 +2965,7 @@ MacroEditorDialog::enter_breakpoint_mode (gsi::Interpreter *interpreter, const g
   //  Adjust the current stack level
   m_current_stack_depth = stack_trace_provider->stack_depth ();
 
-  update_ui_to_run_mode ();
+  do_update_ui_to_run_mode ();
 
   //  Hint: apparently it's necessary to process the events to make the layout system
   //  recognize that we have hidden parts from the edit field by the runtime frame.
@@ -2984,7 +2984,7 @@ MacroEditorDialog::leave_breakpoint_mode ()
   m_in_breakpoint = false;
   m_eval_context = -1;
   mp_current_interpreter = 0;
-  update_ui_to_run_mode ();
+  do_update_ui_to_run_mode ();
   set_exec_point (0, -1, -1);
 }
 
diff --git a/src/rba/rba.cc b/src/rba/rba.cc
index 77a0499fc..82746319f 100644
--- a/src/rba/rba.cc
+++ b/src/rba/rba.cc
@@ -136,7 +136,7 @@ public:
 #endif
 
 private:
-  std::string m_scope;
+  const std::string &m_scope;
 };
 
 // -------------------------------------------------------------------
@@ -2191,7 +2191,6 @@ RubyInterpreter::remove_exec_handler (gsi::ExecutionHandler *exec_handler)
 void
 RubyInterpreter::begin_exec ()
 {
-  d->file_id_map.clear ();
   d->exit_on_next = false;
   d->block_exceptions = false;
   if (d->current_exec_level++ == 0 && d->current_exec_handler) {
diff --git a/src/tl/tlHttpStream.cc b/src/tl/tlHttpStream.cc
index 0ac747ad0..c03e4191c 100644
--- a/src/tl/tlHttpStream.cc
+++ b/src/tl/tlHttpStream.cc
@@ -102,7 +102,7 @@ static QNetworkAccessManager *s_network_manager (0);
 static AuthenticationHandler *s_auth_handler (0);
 
 InputHttpStream::InputHttpStream (const std::string &url)
-  : m_url (url), m_request ("GET"), mp_buffer (0), mp_reply (0)
+  : m_url (url), mp_reply (0), m_request ("GET"), mp_buffer (0)
 {
   if (! s_network_manager) {