diff --git a/brouter-core/src/main/java/btools/router/RoutingContext.java b/brouter-core/src/main/java/btools/router/RoutingContext.java
index f81c071..a42d568 100644
--- a/brouter-core/src/main/java/btools/router/RoutingContext.java
+++ b/brouter-core/src/main/java/btools/router/RoutingContext.java
@@ -84,8 +84,8 @@ public final class RoutingContext {
       pm = new StdModel();
     } else {
       try {
-        Class clazz = Class.forName(className);
-        pm = (OsmPathModel) clazz.newInstance();
+        Class<?> clazz = Class.forName(className);
+        pm = (OsmPathModel) clazz.getDeclaredConstructor().newInstance();
       } catch (Exception e) {
         throw new RuntimeException("Cannot create path-model: " + e);
       }
diff --git a/brouter-expressions/src/main/java/btools/expressions/BExpressionContext.java b/brouter-expressions/src/main/java/btools/expressions/BExpressionContext.java
index c0ff9bc..5d6bf05 100644
--- a/brouter-expressions/src/main/java/btools/expressions/BExpressionContext.java
+++ b/brouter-expressions/src/main/java/btools/expressions/BExpressionContext.java
@@ -850,7 +850,7 @@ public abstract class BExpressionContext implements IByteArrayUnifier {
     Integer num = variableNumbers.get(name);
     if (num == null) {
       if (create) {
-        num = new Integer(variableNumbers.size());
+        num = Integer.valueOf(variableNumbers.size());
         variableNumbers.put(name, num);
       } else {
         return -1;