diff --git a/contractor/edge_based_graph_factory.cpp b/contractor/edge_based_graph_factory.cpp
index d24d63a2b..b5b3d2f48 100644
--- a/contractor/edge_based_graph_factory.cpp
+++ b/contractor/edge_based_graph_factory.cpp
@@ -444,10 +444,9 @@ void EdgeBasedGraphFactory::RenumberEdges()
 {
     // renumber edge based node IDs
     unsigned numbered_edges_count = 0;
-    for (NodeID current_node = 0; current_node < m_node_based_graph->GetNumberOfNodes();
-         ++current_node)
+    for (const auto current_node : osrm::irange(0u, m_node_based_graph->GetNumberOfNodes()))
     {
-        for (EdgeID current_edge : m_node_based_graph->GetAdjacentEdgeRange(current_node))
+        for (const auto current_edge : m_node_based_graph->GetAdjacentEdgeRange(current_node))
         {
             EdgeData &edge_data = m_node_based_graph->GetEdgeData(current_edge);
             if (!edge_data.forward)
@@ -470,7 +469,7 @@ void EdgeBasedGraphFactory::RenumberEdges()
  */
 void EdgeBasedGraphFactory::GenerateEdgeExpandedNodes()
 {
-    SimpleLogger().Write() << "Identifying components of the road network";
+    SimpleLogger().Write() << "Identifying components of the (compressed) road network";
 
     // Run a BFS on the undirected graph and identify small components
     TarjanSCC<NodeBasedDynamicGraph> component_explorer(
@@ -480,6 +479,8 @@ void EdgeBasedGraphFactory::GenerateEdgeExpandedNodes()
 
     SimpleLogger().Write() << "identified: " << component_explorer.get_number_of_components()
                            << " many components";
+    SimpleLogger().Write() << "identified " << component_explorer.get_size_one_count() 
+                           << " SCCs of size 1";
     SimpleLogger().Write() << "generating edge-expanded nodes";
 
     Percent progress(m_node_based_graph->GetNumberOfNodes());
diff --git a/tools/components.cpp b/tools/components.cpp
index 00acbaf4b..eacc0af15 100644
--- a/tools/components.cpp
+++ b/tools/components.cpp
@@ -185,6 +185,9 @@ int main(int argc, char *argv[])
                                                                        restriction_map,
                                                                        bollard_node_list);
         tarjan->run();
+        SimpleLogger().Write() << "identified: " << tarjan->get_number_of_components()
+                           << " many components";
+        SimpleLogger().Write() << "identified " << tarjan->get_size_one_count() << " SCCs of size 1";
 
         // output
         TIMER_START(SCC_RUN_SETUP);