diff --git a/STL_Extension/include/CGAL/Spatial_lock_grid_3.h b/STL_Extension/include/CGAL/Spatial_lock_grid_3.h
index 4ee20abd9f1..1189a120a33 100644
--- a/STL_Extension/include/CGAL/Spatial_lock_grid_3.h
+++ b/STL_Extension/include/CGAL/Spatial_lock_grid_3.h
@@ -512,11 +512,9 @@ public:
 
   Spatial_lock_grid_3(const Bbox_3 &bbox, int num_grid_cells_per_axis)
   : Base(bbox, num_grid_cells_per_axis),
-    m_tls_thread_priorities(init_TLS_thread_priorities),
-    m_grid(num_grid_cells_per_axis*num_grid_cells_per_axis*num_grid_cells_per_axis)
+    m_grid(num_grid_cells_per_axis*num_grid_cells_per_axis*num_grid_cells_per_axis),
+    m_tls_thread_priorities(init_TLS_thread_priorities)
   {
-    int num_cells =
-      num_grid_cells_per_axis*num_grid_cells_per_axis*num_grid_cells_per_axis;
     // Explicitly initialize the atomics
     std::vector<std::atomic<unsigned int> >::iterator it     = m_grid.begin();
     std::vector<std::atomic<unsigned int> >::iterator it_end = m_grid.end();
diff --git a/STL_Extension/test/STL_Extension/test_Concurrent_compact_container.cpp b/STL_Extension/test/STL_Extension/test_Concurrent_compact_container.cpp
index 8ec883d5f72..afe1de689da 100644
--- a/STL_Extension/test/STL_Extension/test_Concurrent_compact_container.cpp
+++ b/STL_Extension/test/STL_Extension/test_Concurrent_compact_container.cpp
@@ -163,7 +163,8 @@ public:
       // Random-pick an element to erase
       int index_to_erase = rand() % m_values.size();
       // If it exists
-      if (m_free_elements[index_to_erase].compare_and_swap(true, false) == false)
+      bool comparand = false;
+      if (m_free_elements[index_to_erase].compare_exchange_weak(comparand, true) )
       {
         m_cont.erase(m_iterators[index_to_erase]);
         ++m_num_erasures;
diff --git a/Triangulation_3/examples/Triangulation_3/sequential_parallel.cpp b/Triangulation_3/examples/Triangulation_3/sequential_parallel.cpp
index 993692647d7..b585b2a9e09 100644
--- a/Triangulation_3/examples/Triangulation_3/sequential_parallel.cpp
+++ b/Triangulation_3/examples/Triangulation_3/sequential_parallel.cpp
@@ -52,7 +52,7 @@ int main()
   ParallelTriangulation T(V.begin(), V.end(), &locking_ds);
   t.stop();
   std::cerr << "Parallel construction takes " << t.time() << " sec. with "
-            << tbb::task_scheduler_init::default_num_threads() << " threads" << std::endl;
+            << std::thread::hardware_concurrency()  << " threads" << std::endl;
 #endif
 
   return 0;