diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfoItem.h b/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfoItem.h
index 1776e45861644692e4a14f1952574a177749d2e1..f60ce0a1657b9e14d129c159d8d4217e33e8a63c 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfoItem.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfoItem.h
@@ -1,10 +1,11 @@
 #ifndef MANTID_GEOMETRY_DETECTORINFOITEM_H_
 #define MANTID_GEOMETRY_DETECTORINFOITEM_H_
 
+#include <utility>
+
 #include "MantidGeometry/Instrument/DetectorInfo.h"
 #include "MantidKernel/V3D.h"
 
-#include <utility>
 using Mantid::Kernel::V3D;
 
 namespace Mantid {
diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfoIterator.h b/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfoIterator.h
index 7bdf19eabd26de6987e650e66cf05a4329c1b6fc..af60badcce4332ce7782fd47d607ad4348aed69a 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfoIterator.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfoIterator.h
@@ -15,7 +15,7 @@ class DetectorInfo;
 class MANTID_GEOMETRY_DLL DetectorInfoIterator
     : public boost::iterator_facade<DetectorInfoIterator,
                                     const DetectorInfoItem &,
-                                    boost::bidirectional_traversal_tag> {
+                                    boost::forward_traversal_tag> {
 
 public:
   DetectorInfoIterator(const DetectorInfo &detectorInfo, const size_t index)
diff --git a/Framework/PythonInterface/test/python/mantid/geometry/DetectorInfoTest.py b/Framework/PythonInterface/test/python/mantid/geometry/DetectorInfoTest.py
index 751b323bd2dc58faf3870ad0902c4c8fc46c5e23..7485e9ee3cb267b8af6fc9c06b912ca14739d284 100644
--- a/Framework/PythonInterface/test/python/mantid/geometry/DetectorInfoTest.py
+++ b/Framework/PythonInterface/test/python/mantid/geometry/DetectorInfoTest.py
@@ -107,8 +107,8 @@ class DetectorInfoTest(unittest.TestCase):
     """
 
     def test_iteration(self):
-        import time
-        time.sleep(20)
+        #import time
+        #time.sleep(20)
         info = self._ws.detectorInfo()
         #self.assertEquals(len(info), 0)
         #self.assertEquals(info.size(), 0)