Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMGraph.java
===================================================================
--- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMGraph.java	(revision 33088)
+++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMGraph.java	(revision 33121)
@@ -34,5 +34,5 @@
 
     public void removeWay(OSMWay way) {
-        ways.remove(way);
+        while (ways.values().remove(way));
     }
 
@@ -51,5 +51,5 @@
 
     public OSMRelation getRelation(int id) {
-        return relations.get(id);
+        return relations.get(Long.valueOf(id));
     }
 
@@ -85,5 +85,5 @@
 
     public ArrayList<Long> getIDsfromWay(int id) {
-        OSMWay w = ways.get(id);
+        OSMWay w = ways.get(Long.valueOf(id));
         ArrayList<Long> ids = new ArrayList<>();
         ids.add(w.getToNode().getId());
Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMRelation.java
===================================================================
--- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMRelation.java	(revision 33088)
+++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/datastructure/OSMRelation.java	(revision 33121)
@@ -53,5 +53,5 @@
      * @author  joerg
      */
-    class Member {
+    static class Member {
 
         private OSMEntity member;
Index: applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/JunctionChecker.java
===================================================================
--- applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/JunctionChecker.java	(revision 33088)
+++ applications/editors/josm/plugins/junctionchecking/src/org/openstreetmap/josm/plugins/JunctionChecker/junctionchecking/JunctionChecker.java	(revision 33121)
@@ -125,5 +125,5 @@
             for (int j = 0; j < junctioncandidates.size(); j++) {
                 if (junctioncandidates.get(i).containsAll(junctioncandidates.get(j))) {
-                    junctions.removeAll(junctioncandidates.get(i));
+                    junctions.remove(junctioncandidates.get(i));
                 }
             }