diff --git a/Surface_mesher/demo/Surface_mesher/qt4-demo/volume.cpp b/Surface_mesher/demo/Surface_mesher/qt4-demo/volume.cpp
index ea814dec7dc..22295e1d7eb 100644
--- a/Surface_mesher/demo/Surface_mesher/qt4-demo/volume.cpp
+++ b/Surface_mesher/demo/Surface_mesher/qt4-demo/volume.cpp
@@ -516,7 +516,7 @@ void Volume::status_message(QString string)
 
 void Volume::busy() const 
 {
-  QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+  QApplication::restoreOverrideCursor();
 }
 
 void Volume::not_busy() const 
@@ -614,7 +614,7 @@ void Volume::display_marchin_cube()
         it = m_surface_mc.begin(), end = m_surface_mc.end();
       it != end; ++it)
   {
-    bbox = bbox + it->first.bbox();
+    bbox = bbox + it->get<0>().bbox();
   }
 
   m_view_mc = true;
@@ -763,7 +763,7 @@ void Volume::display_surface_mesher_result()
         it = m_surface.begin(), end = m_surface.end();
       it != end; ++it)
   {
-    bbox = bbox + it->first.bbox();
+    bbox = bbox + it->get<0>().bbox();
   }
 
   // toggle visualization
@@ -1013,16 +1013,16 @@ void Volume::gl_draw_surface(Iterator begin, Iterator end, const QTreeWidgetItem
   {
     const Facet& f = *it;
 
-    if(f.third != i) continue;
+    if(f.get<2>() != i) continue;
 
-    const Vector& n = f.second;
+    const Vector& n = f.get<1>();
 
     if(m_inverse_normals)
       ::glNormal3d(-n.x(),-n.y(),-n.z());
     else
       ::glNormal3d(n.x(),n.y(),n.z());
 
-    const Triangle_3& t = f.first;
+    const Triangle_3& t = f.get<0>();
     const Point& a = t[0];
     const Point& b = t[1];
     const Point& c = t[2];
diff --git a/Surface_mesher/demo/Surface_mesher/qt4-demo/volume.h b/Surface_mesher/demo/Surface_mesher/qt4-demo/volume.h
index b1f61c204f6..3716951ffeb 100644
--- a/Surface_mesher/demo/Surface_mesher/qt4-demo/volume.h
+++ b/Surface_mesher/demo/Surface_mesher/qt4-demo/volume.h
@@ -41,7 +41,9 @@ typedef Kernel::Vector_3 Vector;
 typedef Kernel::Triangle_3 Triangle_3;
 typedef Kernel::Segment_3 Segment_3;
 
-typedef CGAL::Triple<Triangle_3,Vector,const QTreeWidgetItem*> Facet;
+// typedef CGAL::Triple<Triangle_3,Vector,const QTreeWidgetItem*> Facet;
+
+typedef boost::tuple<Triangle_3,Vector,const QTreeWidgetItem*> Facet;
 
 typedef CBinary_image_3<FT,Point> Binary_image;