diff --git a/brouter-mapaccess/src/main/java/btools/mapaccess/WaypointMatcherImpl.java b/brouter-mapaccess/src/main/java/btools/mapaccess/WaypointMatcherImpl.java
index e70d3be94..85ab9b5f1 100644
--- a/brouter-mapaccess/src/main/java/btools/mapaccess/WaypointMatcherImpl.java
+++ b/brouter-mapaccess/src/main/java/btools/mapaccess/WaypointMatcherImpl.java
@@ -51,7 +51,7 @@ public WaypointMatcherImpl(List<MatchedWaypoint> waypoints, double maxDistance,
     }
 
     // sort result list
-    comparator = new Comparator<>() {
+    comparator = new Comparator<MatchedWaypoint>() {
       @Override
       public int compare(MatchedWaypoint mw1, MatchedWaypoint mw2) {
         int cmpDist = Double.compare(mw1.radius, mw2.radius);
diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BRouterService.java b/brouter-routing-app/src/main/java/btools/routingapp/BRouterService.java
index 1f1694757..a1e89639c 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BRouterService.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BRouterService.java
@@ -273,6 +273,7 @@ private String checkForTestDummy(String baseDir) {
       }
     }
 
+    @SuppressWarnings("deprecation")
     private void logBundle(Bundle params) {
       if (AppLogger.isLogging()) {
         for (String k : params.keySet()) {
diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BRouterWorker.java b/brouter-routing-app/src/main/java/btools/routingapp/BRouterWorker.java
index 64e73d53e..f7a74ff65 100644
--- a/brouter-routing-app/src/main/java/btools/routingapp/BRouterWorker.java
+++ b/brouter-routing-app/src/main/java/btools/routingapp/BRouterWorker.java
@@ -36,6 +36,7 @@ public class BRouterWorker {
   public List<OsmNodeNamed> nogoPolygonsList;
   public String profileParams;
 
+  @SuppressWarnings("deprecation")
   public String getTrackFromParams(Bundle params) {
 
     int engineMode = 0;
diff --git a/brouter-util/src/main/java/btools/util/CompactLongMap.java b/brouter-util/src/main/java/btools/util/CompactLongMap.java
index b29d83af3..49efc08bf 100644
--- a/brouter-util/src/main/java/btools/util/CompactLongMap.java
+++ b/brouter-util/src/main/java/btools/util/CompactLongMap.java
@@ -224,6 +224,7 @@ protected boolean contains(long id, boolean doPut) {
 
 
   // does sorted array "a" contain "id" ?
+  @SuppressWarnings("unchecked")
   private boolean contains(int idx, long id, boolean doPut) {
     long[] a = al[idx];
     int offset = a.length;
@@ -243,6 +244,7 @@ private boolean contains(int idx, long id, boolean doPut) {
     return false;
   }
 
+  @SuppressWarnings("unchecked")
   protected void moveToFrozenArrays(long[] faid, List<V> flv) {
     for (int i = 1; i < MAXLISTS; i++) {
       pa[i] = 0;
diff --git a/brouter-util/src/main/java/btools/util/SortedHeap.java b/brouter-util/src/main/java/btools/util/SortedHeap.java
index 3f2c4f1de..b350d63c3 100644
--- a/brouter-util/src/main/java/btools/util/SortedHeap.java
+++ b/brouter-util/src/main/java/btools/util/SortedHeap.java
@@ -19,6 +19,7 @@ public SortedHeap() {
   /**
    * @return the lowest key value, or null if none
    */
+  @SuppressWarnings("unchecked")
   public V popLowestKeyValue() {
     SortedBin bin = firstNonEmpty;
     if (firstNonEmpty == null) {