Index: trunk/src/org/openstreetmap/josm/data/correction/TagCorrection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/correction/TagCorrection.java	(revision 11083)
+++ trunk/src/org/openstreetmap/josm/data/correction/TagCorrection.java	(revision 11085)
@@ -53,10 +53,11 @@
     public boolean equals(Object o) {
         if (this == o) return true;
-        if (!(o instanceof TagCorrection)) return false;
+        if (o == null || getClass() != o.getClass())
+            return false;
         TagCorrection that = (TagCorrection) o;
         return Objects.equals(oldKey, that.oldKey) &&
-                Objects.equals(newKey, that.newKey) &&
-                Objects.equals(oldValue, that.oldValue) &&
-                Objects.equals(newValue, that.newValue);
+               Objects.equals(newKey, that.newKey) &&
+               Objects.equals(oldValue, that.oldValue) &&
+               Objects.equals(newValue, that.newValue);
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/MapStatus.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 11083)
+++ trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 11085)
@@ -221,5 +221,5 @@
     private final transient List<StatusTextHistory> statusText = new ArrayList<>();
 
-    private static class StatusTextHistory {
+    protected static final class StatusTextHistory {
         private final Object id;
         private final String text;