diff --git a/ors-api/src/test/java/org/heigit/ors/apitests/routing/ResultTest.java b/ors-api/src/test/java/org/heigit/ors/apitests/routing/ResultTest.java
index a16ba164ff..c0be1a476b 100644
--- a/ors-api/src/test/java/org/heigit/ors/apitests/routing/ResultTest.java
+++ b/ors-api/src/test/java/org/heigit/ors/apitests/routing/ResultTest.java
@@ -2018,7 +2018,7 @@ void testWheelchairWidthRestriction() {
                 .then()
                 .assertThat()
                 .body("any { it.key == 'routes' }", is(true))
-                .body("routes[0].summary.distance", is(158.7f))
+                .body("routes[0].summary.distance", is(158.8f))
                 .body("routes[0].summary.duration", is(114.3f))
                 .statusCode(200);
     }
diff --git a/ors-api/src/test/resources/application-test.yml b/ors-api/src/test/resources/application-test.yml
index f030cf1ed8..17cde0e306 100644
--- a/ors-api/src/test/resources/application-test.yml
+++ b/ors-api/src/test/resources/application-test.yml
@@ -12,7 +12,7 @@ ors:
       maximum_intervals: 10
 
   engine:
-    source_file: ./src/test/files/heidelberg.osm.gz
+    source_file: ./src/test/files/heidelberg.ors.pbf
     graphs_root_path: graphs-apitests
     elevation:
       cache_path: ./src/test/files/elevation
diff --git a/ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/reader/borders/CountryBordersReader.java b/ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/reader/borders/CountryBordersReader.java
index de07d1dd70..d522c16545 100644
--- a/ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/reader/borders/CountryBordersReader.java
+++ b/ors-engine/src/main/java/org/heigit/ors/routing/graphhopper/extensions/reader/borders/CountryBordersReader.java
@@ -343,7 +343,7 @@ public String getEngName(String name) {
     }
 
     public String getName(short id) {
-        return names.get(id);
+        return names.getOrDefault(id, INTERNATIONAL_NAME);
     }
 
     /**
diff --git a/ors-engine/src/main/java/org/heigit/ors/routing/pathprocessors/ExtraInfoProcessor.java b/ors-engine/src/main/java/org/heigit/ors/routing/pathprocessors/ExtraInfoProcessor.java
index f25e96a844..f6a72ea0b8 100644
--- a/ors-engine/src/main/java/org/heigit/ors/routing/pathprocessors/ExtraInfoProcessor.java
+++ b/ors-engine/src/main/java/org/heigit/ors/routing/pathprocessors/ExtraInfoProcessor.java
@@ -426,7 +426,8 @@ public void processPathEdge(EdgeIteratorState edge, PointList geom) {
                 coordinate.y = geom.getLat(0);
                 CountryBordersPolygon[] countries = countryBordersReader.getCountry(coordinate);
                 if (countries.length >= 1) {
-                    country1 = Short.parseShort(countryBordersReader.getId(countryBordersReader.getCountry(coordinate)[0].getName()));
+                    short country0 = Short.parseShort(countryBordersReader.getId(countryBordersReader.getCountry(coordinate)[0].getName()));
+                    country1 = country0;
                 }
             }
             if (countryTraversalInfoBuilder != null && country1 != 0) {