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 35248)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java	(revision 35343)
@@ -184,7 +184,6 @@
         }
 
-        OSMAddress aNode = null;
         // Address nodes are recycled in order to keep instance variables like guessed names
-        aNode = OsmFactory.createNode(n);
+        OSMAddress aNode = OsmFactory.createNode(n);
 
         if (aNode != null) {
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 35248)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMAddress.java	(revision 35343)
@@ -420,6 +420,5 @@
         return 0;
 
-    int cc = 0;
-    cc = this.getCountry().compareTo(other.getCountry());
+    int cc = this.getCountry().compareTo(other.getCountry());
     if (cc == 0) {
         cc = this.getState().compareTo(other.getState());
Index: applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMEntityBase.java
===================================================================
--- applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMEntityBase.java	(revision 35248)
+++ applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OSMEntityBase.java	(revision 35343)
@@ -26,5 +26,5 @@
  * </ol>
  */
-public class OSMEntityBase implements IOSMEntity, Comparable<IOSMEntity> {
+public class OSMEntityBase implements IOSMEntity {
     public static final String ANONYMOUS = tr("No name");
     private static List<IAddressEditContainerListener> containerListeners = new ArrayList<>();