diff --git a/src/extractor/extraction_containers.cpp b/src/extractor/extraction_containers.cpp
index 9f771d226..8ae7aa2ee 100644
--- a/src/extractor/extraction_containers.cpp
+++ b/src/extractor/extraction_containers.cpp
@@ -765,7 +765,7 @@ void ExtractionContainers::PrepareRestrictions()
     // translate the turn from one segment onto another into a node restriction (the ways can only
     // be connected at a single location)
     auto const get_node_restriction_from_OSM_ids = [&](
-        auto const from_id, auto const to_id, const OSMNodeID via_node = MAX_OSM_NODEID) {
+        auto const from_id, auto const to_id, const OSMNodeID via_node) {
         auto const from_segment_itr = referenced_ways.find(from_id);
         if (from_segment_itr->second.way_id != from_id)
         {
@@ -792,9 +792,9 @@ void ExtractionContainers::PrepareRestrictions()
             auto const &external = external_type.AsWayRestriction();
             // check if we were able to resolve all the involved ways
             auto const from_restriction =
-                get_node_restriction_from_OSM_ids(external.from, external.via);
+                get_node_restriction_from_OSM_ids(external.from, external.via, MAX_OSM_NODEID);
             auto const to_restriction =
-                get_node_restriction_from_OSM_ids(external.via, external.to);
+                get_node_restriction_from_OSM_ids(external.via, external.to, MAX_OSM_NODEID);
 
             // failed to translate either of the involved nodes?
             if (!from_restriction.Valid() || !to_restriction.Valid())
diff --git a/src/extractor/restriction_parser.cpp b/src/extractor/restriction_parser.cpp
index 996743ece..135a3db68 100644
--- a/src/extractor/restriction_parser.cpp
+++ b/src/extractor/restriction_parser.cpp
@@ -128,7 +128,7 @@ RestrictionParser::TryParse(const osmium::Relation &relation) const
     restriction_container.is_only = is_only_restriction;
 
     boost::optional<std::uint64_t> from = boost::none, via = boost::none, to = boost::none;
-    bool is_node_restriction;
+    bool is_node_restriction = true;
 
     for (const auto &member : relation.members())
     {