Index: /applications/editors/josm/plugins/FixAddresses/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/.settings/org.eclipse.jdt.core.prefs	(revision 29868)
+++ /applications/editors/josm/plugins/FixAddresses/.settings/org.eclipse.jdt.core.prefs	(revision 29869)
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.compliance=1.7
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
@@ -9,3 +9,3 @@
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.compiler.source=1.7
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java	(revision 29868)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java	(revision 29869)
@@ -109,5 +109,4 @@
 	}
 
-
 	/**
 	 * Adds a change listener.
@@ -530,5 +529,5 @@
 			clearData();
 			clearProblems();
-
+			/*
 			for (OsmPrimitive osmPrimitive : osmData) {
 				if (osmPrimitive.isUsable()) {
@@ -536,5 +535,5 @@
 				}
 			}
-
+			 */
 			resolveAddresses();
 			// sort lists
@@ -799,7 +798,9 @@
 		 * @return the score of the street.
 		 */
-		/*protected int getScore() {
+		@SuppressWarnings("unused")
+		// TODO: Implement properly
+		protected int getScore() {
 			return score;
-		}*/
+		}
 
 		@Override
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesPlugin.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesPlugin.java	(revision 29868)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixAddressesPlugin.java	(revision 29869)
@@ -42,6 +42,6 @@
 
 		// ... and add them to the tools menu in main
-                MainMenu.add(Main.main.menu.dataMenu, action, false, 0);
-		MainMenu.add(Main.main.menu.selectionMenu, incAddrAction);
+                MainMenu.add(Main.main.menu.toolsMenu, action, false, 0);
+		MainMenu.add(Main.main.menu.toolsMenu, incAddrAction);
 
 		// create preferences instance
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessAddressRunnable.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessAddressRunnable.java	(revision 29868)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessAddressRunnable.java	(revision 29869)
@@ -177,5 +177,5 @@
 							break;
 						}
-						way.accept(guesser);						
+						way.visit(guesser);						
 					}
 					
@@ -197,5 +197,5 @@
 							break;
 						}
-						node.accept(guesser);						
+						node.visit(guesser);						
 					}
 					
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/IOSMEntity.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/IOSMEntity.java	(revision 29868)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/IOSMEntity.java	(revision 29869)
@@ -78,3 +78,5 @@
 	 */
 	public void visit(IAllKnowingTrashHeap trashHeap, IProblemVisitor visitor);
+
+	int compareTo(IOSMEntity o);
 }
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMAddress.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMAddress.java	(revision 29868)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMAddress.java	(revision 29869)
@@ -414,4 +414,6 @@
 		}
 		OSMAddress other = (OSMAddress) o;
+		
+		if (this.equals(other)) return 0;
 
 		int cc = 0;