Index: trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveComparator.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveComparator.java	(revision 9928)
+++ trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveComparator.java	(revision 9929)
@@ -5,5 +5,4 @@
 import java.util.Comparator;
 import java.util.HashMap;
-import java.util.Map;
 
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
@@ -20,5 +19,5 @@
     private static final long serialVersionUID = 1L;
 
-    private final Map<OsmPrimitive, String> cache = new HashMap<>();
+    private final HashMap<OsmPrimitive, String> cache = new HashMap<>();
     private final boolean relationsFirst;
     private final boolean quick;
Index: trunk/src/org/openstreetmap/josm/data/validation/Severity.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/Severity.java	(revision 9928)
+++ trunk/src/org/openstreetmap/josm/data/validation/Severity.java	(revision 9929)
@@ -41,6 +41,8 @@
 
     public static void getColors() {
-        for (Severity c:values()) {
-            c.getColor();
+        for (Severity c : values()) {
+            if (Main.isDebugEnabled()) {
+                Main.debug(c.toString());
+            }
         }
     }
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java	(revision 9928)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java	(revision 9929)
@@ -1137,5 +1137,5 @@
             });
             final Collection<Float> nonNullList = Utils.filter(floats, Predicates.not(Predicates.isNull()));
-            return nonNullList.isEmpty() ? Float.NaN : computeMax ? Collections.max(nonNullList) : Collections.min(nonNullList);
+            return nonNullList.isEmpty() ? (Float) Float.NaN : computeMax ? Collections.max(nonNullList) : Collections.min(nonNullList);
         }