Index: /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(revision 9797)
+++ /trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(revision 9798)
@@ -243,5 +243,4 @@
         public long generateTime;
         public long sortTime;
-        public long drawTime;
         public Map<Class<? extends StyleElement>, Integer> styleElementCount;
         public boolean skipDraw;
@@ -1961,5 +1960,4 @@
                 timeFinished = System.currentTimeMillis();
                 if (benchmarkData != null) {
-                    benchmarkData.drawTime = timeFinished - timeGenerateDone;
                     benchmarkData.recordElementStats(allStyleElems);
                 }
Index: /trunk/src/org/openstreetmap/josm/data/preferences/PreferencesReader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/preferences/PreferencesReader.java	(revision 9797)
+++ /trunk/src/org/openstreetmap/josm/data/preferences/PreferencesReader.java	(revision 9798)
@@ -61,5 +61,5 @@
      */
     public static void validateXML(Reader in) throws IOException, SAXException {
-        try (InputStream xsdStream = new CachedFile("resource://data/preferences.xsd").getInputStream()) {
+        try (CachedFile cf = new CachedFile("resource://data/preferences.xsd"); InputStream xsdStream = cf.getInputStream()) {
             Schema schema = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI).newSchema(new StreamSource(xsdStream));
             Validator validator = schema.newValidator();