diff --git a/CMakeLists.txt b/CMakeLists.txt
index d8e48d931..a11f6011b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -179,6 +179,7 @@ target_link_libraries(osrm-extract ${CMAKE_THREAD_LIBS_INIT})
 find_package(TBB REQUIRED)
 target_link_libraries(osrm-extract ${TBB_LIBRARIES})
 target_link_libraries(osrm-prepare ${TBB_LIBRARIES})
+target_link_libraries(osrm-routed ${TBB_LIBRARIES})
 include_directories(${TBB_INCLUDE_DIR})
 
 find_package(Lua52)
@@ -248,13 +249,14 @@ if(WITH_TOOLS)
   endif()
   add_executable(osrm-cli Tools/simpleclient.cpp)
   target_link_libraries(osrm-cli ${Boost_LIBRARIES} OSRM UUID GITDESCRIPTION)
-    add_executable(osrm-io-benchmark Tools/io-benchmark.cpp)
-    target_link_libraries(osrm-io-benchmark ${Boost_LIBRARIES} GITDESCRIPTION)
-    add_executable(osrm-unlock-all Tools/unlock_all_mutexes.cpp)
-    target_link_libraries(osrm-unlock-all ${Boost_LIBRARIES} GITDESCRIPTION)
-    if(UNIX AND NOT APPLE)
-        target_link_libraries(osrm-unlock-all rt)
-    endif()
+  target_link_libraries(osrm-cli ${TBB_LIBRARIES})
+  add_executable(osrm-io-benchmark Tools/io-benchmark.cpp)
+  target_link_libraries(osrm-io-benchmark ${Boost_LIBRARIES} GITDESCRIPTION)
+  add_executable(osrm-unlock-all Tools/unlock_all_mutexes.cpp)
+  target_link_libraries(osrm-unlock-all ${Boost_LIBRARIES} GITDESCRIPTION)
+  if(UNIX AND NOT APPLE)
+      target_link_libraries(osrm-unlock-all rt)
+  endif()
 endif()
 
 file(GLOB InstallGlob Include/osrm/*.h Library/OSRM.h)
diff --git a/DataStructures/StaticGraph.h b/DataStructures/StaticGraph.h
index ef27261cf..9210c8736 100644
--- a/DataStructures/StaticGraph.h
+++ b/DataStructures/StaticGraph.h
@@ -33,8 +33,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../Util/SimpleLogger.h"
 #include "../typedefs.h"
 
+#include <boost/assert.hpp>
 #include <boost/range/irange.hpp>
 
+#include <tbb/parallel_sort.h>
+
 #include <algorithm>
 #include <limits>
 #include <vector>
@@ -81,7 +84,7 @@ template <typename EdgeDataT, bool UseSharedMemory = false> class StaticGraph
 
     StaticGraph(const int nodes, std::vector<InputEdge> &graph)
     {
-        std::sort(graph.begin(), graph.end());
+        tbb::parallel_sort(graph.begin(), graph.end());
         number_of_nodes = nodes;
         number_of_edges = (EdgeIterator)graph.size();
         node_array.resize(number_of_nodes + 1);
@@ -106,7 +109,7 @@ template <typename EdgeDataT, bool UseSharedMemory = false> class StaticGraph
             {
                 edge_array[i].target = graph[edge].target;
                 edge_array[i].data = graph[edge].data;
-                assert(edge_array[i].data.distance > 0);
+                BOOST_ASSERT(edge_array[i].data.distance > 0);
                 edge++;
             }
         }
@@ -127,26 +130,27 @@ template <typename EdgeDataT, bool UseSharedMemory = false> class StaticGraph
         {
             for (auto eid : GetAdjacentEdgeRange(u))
             {
-                const unsigned v = GetTarget(eid);
                 const EdgeData &data = GetEdgeData(eid);
-                if (data.shortcut)
+                if (!data.shortcut)
                 {
-                    const EdgeID first_edge_id = FindEdgeInEitherDirection(u, data.id);
-                    if (SPECIAL_EDGEID == first_edge_id)
-                    {
-                        SimpleLogger().Write(logWARNING) << "cannot find first segment of edge ("
-                                                         << u << "," << data.id << "," << v
-                                                         << "), eid: " << eid;
-                        BOOST_ASSERT(false);
-                    }
-                    const EdgeID second_edge_id = FindEdgeInEitherDirection(data.id, v);
-                    if (SPECIAL_EDGEID == second_edge_id)
-                    {
-                        SimpleLogger().Write(logWARNING) << "cannot find second segment of edge ("
-                                                         << u << "," << data.id << "," << v
-                                                         << "), eid: " << eid;
-                        BOOST_ASSERT(false);
-                    }
+                    continue;
+                }
+                const unsigned v = GetTarget(eid);
+                const EdgeID first_edge_id = FindEdgeInEitherDirection(u, data.id);
+                if (SPECIAL_EDGEID == first_edge_id)
+                {
+                    SimpleLogger().Write(logWARNING) << "cannot find first segment of edge ("
+                                                     << u << "," << data.id << "," << v
+                                                     << "), eid: " << eid;
+                    BOOST_ASSERT(false);
+                }
+                const EdgeID second_edge_id = FindEdgeInEitherDirection(data.id, v);
+                if (SPECIAL_EDGEID == second_edge_id)
+                {
+                    SimpleLogger().Write(logWARNING) << "cannot find second segment of edge ("
+                                                     << u << "," << data.id << "," << v
+                                                     << "), eid: " << eid;
+                    BOOST_ASSERT(false);
                 }
             }
             p.printIncrement();