Index: trunk/src/org/openstreetmap/josm/data/AutosaveTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/AutosaveTask.java	(revision 7949)
+++ trunk/src/org/openstreetmap/josm/data/AutosaveTask.java	(revision 7951)
@@ -105,5 +105,5 @@
 
             timer = new Timer(true);
-            timer.schedule(this, 1000, PROP_INTERVAL.get() * 1000);
+            timer.schedule(this, 1000L, PROP_INTERVAL.get() * 1000L);
             MapView.addLayerChangeListener(this);
             if (Main.isDisplayingMapView()) {
@@ -152,5 +152,6 @@
         Date now = new Date();
         while (true) {
-            String filename = String.format("%1$s_%2$tY%2$tm%2$td_%2$tH%2$tM%2$tS%2$tL%3$s", layer.layerFileName, now, index == 0?"":"_" + index);
+            String filename = String.format("%1$s_%2$tY%2$tm%2$td_%2$tH%2$tM%2$tS%2$tL%3$s",
+                    layer.layerFileName, now, index == 0 ? "" : "_" + index);
             File result = new File(autosaveDir, filename+".osm");
             try {
@@ -374,6 +375,6 @@
             if (!f.delete()) {
                 Main.warn(String.format("Could not delete backup file %s", f));
-            } else {
-                pidFile.delete();
+            } else if (!pidFile.delete()) {
+                Main.warn(String.format("Could not delete PID file %s", pidFile));
             }
         }
Index: trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java	(revision 7949)
+++ trunk/src/org/openstreetmap/josm/data/projection/datum/NTV2GridShiftFile.java	(revision 7951)
@@ -129,11 +129,11 @@
         in.read(b8);
         in.read(b8);
-        version = new String(b8);
-        in.read(b8);
-        in.read(b8);
-        fromEllipsoid = new String(b8);
-        in.read(b8);
-        in.read(b8);
-        toEllipsoid = new String(b8);
+        version = new String(b8, StandardCharsets.UTF_8);
+        in.read(b8);
+        in.read(b8);
+        fromEllipsoid = new String(b8, StandardCharsets.UTF_8);
+        in.read(b8);
+        in.read(b8);
+        toEllipsoid = new String(b8, StandardCharsets.UTF_8);
         in.read(b8);
         in.read(b8);