diff --git a/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfoIterator.h b/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfoIterator.h
index 322ff622ec3c42a9aeb62df070deeb6ca4297287..2a4decd56230a2cce317a63a77aa81ebdb83c53f 100644
--- a/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfoIterator.h
+++ b/Framework/Geometry/inc/MantidGeometry/Instrument/DetectorInfoIterator.h
@@ -45,7 +45,7 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
 class MANTID_GEOMETRY_DLL DetectorInfoIterator
     : public boost::iterator_facade<DetectorInfoIterator,
                                     const DetectorInfoItem &,
-                                    boost::bidirectional_traversal_tag> {
+                                    boost::random_access_traversal_tag> {
 
 public:
   DetectorInfoIterator(const DetectorInfo &detectorInfo, const size_t index)
diff --git a/Framework/Geometry/test/DetectorInfoIteratorTest.h b/Framework/Geometry/test/DetectorInfoIteratorTest.h
index b58dc886b9524c2204ba39ff7c9bf7b4937dfc5d..418fe374214a0c0c591befde8be0abccf972655e 100644
--- a/Framework/Geometry/test/DetectorInfoIteratorTest.h
+++ b/Framework/Geometry/test/DetectorInfoIteratorTest.h
@@ -151,8 +151,8 @@ public:
     std::advance(iter, -2);
     TS_ASSERT_EQUALS(iter->getIndex(), 9);
 
-    // Go past the start
-    std::advance(iter, -100);
+    // Go to the start
+    std::advance(iter, -9);
     TS_ASSERT(iter == detectorInfo->begin());
   }
 
diff --git a/Framework/PythonInterface/mantid/geometry/src/Exports/DetectorInfo.cpp b/Framework/PythonInterface/mantid/geometry/src/Exports/DetectorInfo.cpp
index 6cc4bbd73fc9bb9bba63ce03543612ab1b1fa201..f7091c47ccff3a92ba796f6626121a67da1d43ea 100644
--- a/Framework/PythonInterface/mantid/geometry/src/Exports/DetectorInfo.cpp
+++ b/Framework/PythonInterface/mantid/geometry/src/Exports/DetectorInfo.cpp
@@ -26,7 +26,7 @@ using namespace boost::python;
 // Helper method to make the python iterator
 DetectorInfoPythonIterator make_pyiterator(const DetectorInfo &detectorInfo) {
   return DetectorInfoPythonIterator(detectorInfo);
-};
+}
 
 // Export DetectorInfo
 void export_DetectorInfo() {