diff --git a/Polyhedron/demo/Polyhedron/Polyhedron_demo_cut_plugin.cpp b/Polyhedron/demo/Polyhedron/Polyhedron_demo_cut_plugin.cpp
index 359fd2f0ab6..4f4937f358b 100644
--- a/Polyhedron/demo/Polyhedron/Polyhedron_demo_cut_plugin.cpp
+++ b/Polyhedron/demo/Polyhedron/Polyhedron_demo_cut_plugin.cpp
@@ -94,6 +94,7 @@ private:
 
     mutable QOpenGLShaderProgram *program;
 
+    using Scene_item::initialize_buffers;
     void initialize_buffers(Viewer_interface *viewer)const
     {
         program = getShaderProgram(PROGRAM_WITHOUT_LIGHT, viewer);
diff --git a/Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp b/Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp
index 032839022bf..5447453646b 100644
--- a/Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp
+++ b/Polyhedron/demo/Polyhedron/Polyhedron_demo_mesh_3_plugin_cgal_code.cpp
@@ -403,6 +403,7 @@ private:
 
     mutable QOpenGLShaderProgram *program;
 
+    using Scene_item::initialize_buffers;
     void initialize_buffers(Viewer_interface *viewer)const
     {
         //vao containing the data for the facets
diff --git a/Polyhedron/demo/Polyhedron/Polyhedron_demo_trivial_plugin.cpp b/Polyhedron/demo/Polyhedron/Polyhedron_demo_trivial_plugin.cpp
index 03d68e4c8c0..a4de4e1580f 100644
--- a/Polyhedron/demo/Polyhedron/Polyhedron_demo_trivial_plugin.cpp
+++ b/Polyhedron/demo/Polyhedron/Polyhedron_demo_trivial_plugin.cpp
@@ -73,6 +73,7 @@ private:
 
     std::vector<float> positions_lines;
     mutable QOpenGLShaderProgram *program;
+    using Scene_item::initialize_buffers;
     void initialize_buffers(Viewer_interface *viewer)const
     {
 
diff --git a/Polyhedron/demo/Polyhedron/Scene_edit_polyhedron_item.h b/Polyhedron/demo/Polyhedron/Scene_edit_polyhedron_item.h
index 8eb12deb81f..67f30bcd0b5 100644
--- a/Polyhedron/demo/Polyhedron/Scene_edit_polyhedron_item.h
+++ b/Polyhedron/demo/Polyhedron/Scene_edit_polyhedron_item.h
@@ -289,6 +289,7 @@ private:
   mutable QOpenGLShaderProgram bbox_program;
 
   mutable QOpenGLBuffer *in_bu;
+  using Scene_item::initialize_buffers;
   void initialize_buffers(Viewer_interface *viewer) const;
   void compute_normals_and_vertices(void);
   void compute_bbox(const Scene_interface::Bbox&);
diff --git a/Polyhedron/demo/Polyhedron/Scene_implicit_function_item.h b/Polyhedron/demo/Polyhedron/Scene_implicit_function_item.h
index 27caf1b0980..0e8a3700766 100644
--- a/Polyhedron/demo/Polyhedron/Scene_implicit_function_item.h
+++ b/Polyhedron/demo/Polyhedron/Scene_implicit_function_item.h
@@ -107,6 +107,7 @@ private:
 
   GLuint vao;
   GLuint buffer[4];
+  using Scene_item::initialize_buffers;
   void initialize_buffers(Viewer_interface *viewer) const;
   void compute_vertices_and_texmap(void);
   void compute_texture(int, int);
diff --git a/Polyhedron/demo/Polyhedron/Scene_nef_polyhedron_item.cpp b/Polyhedron/demo/Polyhedron/Scene_nef_polyhedron_item.cpp
index f4800d5a7b3..72c5d6d49ce 100644
--- a/Polyhedron/demo/Polyhedron/Scene_nef_polyhedron_item.cpp
+++ b/Polyhedron/demo/Polyhedron/Scene_nef_polyhedron_item.cpp
@@ -245,7 +245,7 @@ void Scene_nef_polyhedron_item::compute_normals_and_vertices(void)
 
                     }
                     //check if the facet is external or internal
-                    std::queue<typename CDT::Face_handle> face_queue;
+                    std::queue<CDT::Face_handle> face_queue;
                     face_queue.push(cdt.infinite_vertex()->face());
 
                     while(! face_queue.empty() ) {
diff --git a/Polyhedron/demo/Polyhedron/Scene_nef_polyhedron_item.h b/Polyhedron/demo/Polyhedron/Scene_nef_polyhedron_item.h
index 42fef61a99a..d588f1c69cf 100644
--- a/Polyhedron/demo/Polyhedron/Scene_nef_polyhedron_item.h
+++ b/Polyhedron/demo/Polyhedron/Scene_nef_polyhedron_item.h
@@ -85,6 +85,7 @@ private:
 
   mutable QOpenGLShaderProgram *program;
 
+  using Scene_item::initialize_buffers;
   void initialize_buffers(Viewer_interface *viewer) const;
   void compute_normals_and_vertices(void);
 
diff --git a/Polyhedron/demo/Polyhedron/Scene_plane_item.h b/Polyhedron/demo/Polyhedron/Scene_plane_item.h
index 2551258365c..b9b45d28903 100644
--- a/Polyhedron/demo/Polyhedron/Scene_plane_item.h
+++ b/Polyhedron/demo/Polyhedron/Scene_plane_item.h
@@ -158,6 +158,7 @@ private:
   mutable bool smooth_shading;
   mutable QOpenGLShaderProgram *program;
 
+  using Scene_item::initialize_buffers;
   void initialize_buffers(Viewer_interface*)const;
   void compute_normals_and_vertices(void);
 };
diff --git a/Polyhedron/demo/Polyhedron/Scene_points_with_normal_item.h b/Polyhedron/demo/Polyhedron/Scene_points_with_normal_item.h
index e2b2e1c9227..302243c3318 100644
--- a/Polyhedron/demo/Polyhedron/Scene_points_with_normal_item.h
+++ b/Polyhedron/demo/Polyhedron/Scene_points_with_normal_item.h
@@ -95,6 +95,7 @@ private:
 
   mutable QOpenGLShaderProgram *program;
 
+  using Scene_item::initialize_buffers;
   void initialize_buffers(Viewer_interface *viewer) const;
 
   void compute_normals_and_vertices(void);
diff --git a/Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp b/Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
index 4c819c42841..6a77d95fc74 100644
--- a/Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
+++ b/Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.cpp
@@ -188,7 +188,7 @@ Scene_polygon_soup_item::triangulate_polygon(Polygons_iterator pit)
     }
 
     //check if the facet is external or internal
-    std::queue<typename CDT::Face_handle> face_queue;
+    std::queue<CDT::Face_handle> face_queue;
     face_queue.push(cdt.infinite_vertex()->face());
     while(! face_queue.empty() ) {
         CDT::Face_handle fh = face_queue.front();
diff --git a/Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.h b/Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.h
index 8b9ec7ffe41..a5f9ffd7394 100644
--- a/Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.h
+++ b/Polyhedron/demo/Polyhedron/Scene_polygon_soup_item.h
@@ -170,6 +170,7 @@ private:
     std::vector<float> positions_lines;
     std::vector<float> normals;
 
+    using Scene_item::initialize_buffers;
     void initialize_buffers(Viewer_interface *viewer) const;
     void compute_normals_and_vertices(void);
     void triangulate_polygon(Polygons_iterator );
diff --git a/Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h b/Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
index 9838b2b7024..e137667cae1 100644
--- a/Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
+++ b/Polyhedron/demo/Polyhedron/Scene_polyhedron_selection_item.h
@@ -240,7 +240,7 @@ public:
     typedef boost::unordered_set<Facet_handle, CGAL::Handle_hash_function>      Selection_set_facet;
     typedef boost::unordered_set<edge_descriptor, CGAL::Handle_hash_function>    Selection_set_edge;
 
-
+    using Scene_polyhedron_item_decorator::draw;
     virtual void draw(Viewer_interface*) const;
     virtual void draw_edges() const { }
     virtual void draw_edges(Viewer_interface*) const;
@@ -704,6 +704,7 @@ private:
     std::vector<float> positions_points;
 
     mutable QOpenGLShaderProgram *program;
+    using Scene_item::initialize_buffers;
     void initialize_buffers(Viewer_interface *viewer) const;
     void compute_elements();
 
diff --git a/Polyhedron/demo/Polyhedron/Scene_polyhedron_shortest_path_item.h b/Polyhedron/demo/Polyhedron/Scene_polyhedron_shortest_path_item.h
index 996084333fa..6a51bbcb1f6 100644
--- a/Polyhedron/demo/Polyhedron/Scene_polyhedron_shortest_path_item.h
+++ b/Polyhedron/demo/Polyhedron/Scene_polyhedron_shortest_path_item.h
@@ -104,6 +104,7 @@ private:
   std::vector<float> vertices;
   mutable QOpenGLShaderProgram *program;
 
+  using Scene_polyhedron_item_decorator::initialize_buffers;
   void initialize_buffers(Viewer_interface *viewer = 0) const;
   void compute_elements(void);
   
@@ -120,6 +121,7 @@ public:
   Primitives_mode get_primitives_mode() const;
   
   virtual bool supportsRenderingMode(RenderingMode m) const;
+  using Scene_polyhedron_item_decorator::draw;
   virtual void draw(Viewer_interface*) const;
   // Points OpenGL drawing
   virtual void draw_points(Viewer_interface*) const;
diff --git a/Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.h b/Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.h
index 7b97e8977a4..274fa999d1c 100644
--- a/Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.h
+++ b/Polyhedron/demo/Polyhedron/Scene_polyhedron_transform_item.h
@@ -38,6 +38,7 @@ private:
     qglviewer::Vec center_;
     mutable QOpenGLShaderProgram *program;
     std::vector<float> positions_lines;
+    using Scene_item::initialize_buffers;
     void initialize_buffers(Viewer_interface *viewer) const;
     void compute_elements();
 
diff --git a/Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp b/Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp
index 39288d669eb..a2d89050653 100644
--- a/Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp
+++ b/Polyhedron/demo/Polyhedron/Scene_polylines_item.cpp
@@ -463,7 +463,7 @@ Scene_polylines_item::compute_elements()
 
         //Convert the triangle coordinates to lines coordinates for the
         //Wiremode in the spheres
-        for(int i=0; i< (int) positions_spheres.size(); i=i)
+        for(int i=0; i< (int) positions_spheres.size();)
         {
             //draw triangles
             if(i< (360/sectors)*12)
diff --git a/Polyhedron/demo/Polyhedron/Scene_polylines_item.h b/Polyhedron/demo/Polyhedron/Scene_polylines_item.h
index f17f9db7b77..bd5059f0499 100644
--- a/Polyhedron/demo/Polyhedron/Scene_polylines_item.h
+++ b/Polyhedron/demo/Polyhedron/Scene_polylines_item.h
@@ -109,6 +109,7 @@ private:
     typedef std::map<Point_3, int> Point_to_int_map;
     typedef Point_to_int_map::iterator iterator;
     void create_Sphere(double);
+    using Scene_item::initialize_buffers;
     void initialize_buffers(Viewer_interface *viewer) const;
     void compute_elements();
 
diff --git a/Polyhedron/demo/Polyhedron/Scene_textured_polyhedron_item.h b/Polyhedron/demo/Polyhedron/Scene_textured_polyhedron_item.h
index 506fd8a3422..dfd59a47038 100644
--- a/Polyhedron/demo/Polyhedron/Scene_textured_polyhedron_item.h
+++ b/Polyhedron/demo/Polyhedron/Scene_textured_polyhedron_item.h
@@ -62,6 +62,8 @@ private:
   mutable QOpenGLShaderProgram* program;
 
   bool smooth_shading;
+
+  using Scene_item::initialize_buffers;
   void initialize_buffers(Viewer_interface *viewer) const;
   void compute_normals_and_vertices(void);