diff --git a/src/shapevl/Collector.h b/src/shapevl/Collector.h
index 14af683..27fae1f 100644
--- a/src/shapevl/Collector.h
+++ b/src/shapevl/Collector.h
@@ -34,11 +34,13 @@ class Collector {
         _fdSum(0),
         _unmatchedSegSum(0),
         _unmatchedSegLengthSum(0),
-        _acc0(0),
-        _acc10(0),
-        _acc20(0),
-        _acc40(0),
-        _acc80(0),
+        _an0(0),
+        _an5(0),
+        _an10(0),
+        _an30(0),
+        _an50(0),
+        _an70(0),
+        _an90(0),
         _reportOut(reportOut) {}
 
   // Add a shape found by our tool newS for a trip t with newly calculated
diff --git a/src/shapevl/ShapevlMain.cpp b/src/shapevl/ShapevlMain.cpp
index 3b94342..1469582 100644
--- a/src/shapevl/ShapevlMain.cpp
+++ b/src/shapevl/ShapevlMain.cpp
@@ -53,7 +53,7 @@ void eval(const std::vector<std::string>* paths,
     }
 
     LOG(DEBUG) << "Evaluating " << path << "...";
-    for (const auto oldTrip : evalFeed->getTrips()) {
+    for (const auto& oldTrip : evalFeed->getTrips()) {
       if (!mots->count(oldTrip.second->getRoute()->getType())) continue;
       auto newTrip = feed.getTrips().get(oldTrip.first);
       if (!newTrip)