Index: /trunk/FACT++/src/EventBuilderWrapper.h
===================================================================
--- /trunk/FACT++/src/EventBuilderWrapper.h	(revision 16468)
+++ /trunk/FACT++/src/EventBuilderWrapper.h	(revision 16469)
@@ -832,5 +832,5 @@
         const lock_guard<mutex> lock(mtx_newrun);
 
-        map<uint32_t,FAD::RunDescription>::const_iterator it = fExpectedRuns.begin();
+        map<uint32_t,FAD::RunDescription>::iterator it = fExpectedRuns.begin();
         while (it!=fExpectedRuns.end())
         {
Index: /trunk/FACT++/src/Readline.cc
===================================================================
--- /trunk/FACT++/src/Readline.cc	(revision 16468)
+++ /trunk/FACT++/src/Readline.cc	(revision 16469)
@@ -1278,9 +1278,5 @@
     stifle_history(0);
     unstifle_history();
-#if BOOST_VERSION < 104600
-    read_history(his.c_str());
-#else
     read_history(his.string().c_str());
-#endif
 }
 
@@ -1298,11 +1294,6 @@
     his /= fname;
 
-#if BOOST_VERSION < 104600
-    write_history(his.c_str());
-    history_truncate_file(his.c_str(), 1000);
-#else
     write_history(his.string().c_str());
     history_truncate_file(his.string().c_str(), 1000);
-#endif
 
     stifle_history(0);
Index: /trunk/FACT++/src/temperature.cc
===================================================================
--- /trunk/FACT++/src/temperature.cc	(revision 16468)
+++ /trunk/FACT++/src/temperature.cc	(revision 16469)
@@ -1,2 +1,6 @@
+#if BOOST_VERSION < 104600
+#include <assert.h>
+#endif
+
 #include <boost/bind.hpp>
 #include <boost/array.hpp>