diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_topology_traits_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_topology_traits_2.h
index 707e97bb684..b9e85f43067 100644
--- a/Arrangement_on_surface_2/include/CGAL/Arr_spherical_topology_traits_2.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_spherical_topology_traits_2.h
@@ -39,6 +39,7 @@
 #include <CGAL/Sweep_line_2/Arr_overlay_traits_2.h>
 #include <CGAL/Sweep_line_2/Arr_overlay_sl_visitor.h>
 #include <CGAL/Sweep_line_2/Arr_batched_pl_sl_visitor.h>
+#include <CGAL/Sweep_line_2/Arr_vert_decomp_sl_visitor.h>
 #include <CGAL/Arr_point_location/Arr_batched_point_location_traits_2.h>
 
 #include <CGAL/Arr_topology_traits/Arr_spherical_construction_helper.h>
diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_vert_decomp_helper.h b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_vert_decomp_helper.h
index f8bac716107..e9566e297e7 100755
--- a/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_vert_decomp_helper.h
+++ b/Arrangement_on_surface_2/include/CGAL/Arr_topology_traits/Arr_spherical_vert_decomp_helper.h
@@ -60,7 +60,7 @@ public:
   /*! Constructor.
    * \param arr The arrangement.
    */
-  Arr_spherical_batched_pl_helper(const Arrangement_2 *arr) :
+  Arr_spherical_vert_decomp_helper(const Arrangement_2 *arr) :
     m_top_traits(arr->topology_traits())
   {}
 
@@ -71,7 +71,7 @@ public:
   void before_sweep()
   {
     // Get the spherical face of the arrangement.
-    m_north_face = Face_handle_red(m_top_traits->spherical_face());
+    m_north_face = Face_const_handle(m_top_traits->spherical_face());
     return;
   }
 
@@ -89,14 +89,14 @@ public:
   CGAL::Object top_object () const
   {
     // Wrap the north face with a CGAL object.
-    return (m_north_face);
+    return (CGAL::make_object (m_north_face));
   }
 
   /*! Get the current bottom object. */
   CGAL::Object bottom_object () const
   {
     // Wrap the north face with a CGAL object.
-    return (m_north_face);
+    return (CGAL::make_object (m_north_face));
   }
 };