Index: trunk/src/org/openstreetmap/josm/actions/AboutAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/AboutAction.java	(revision 14865)
+++ trunk/src/org/openstreetmap/josm/actions/AboutAction.java	(revision 14866)
@@ -67,5 +67,5 @@
     }
 
-    protected JPanel buildAboutPanel() {
+    JPanel buildAboutPanel() {
         final JTabbedPane about = new JTabbedPane();
 
Index: trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java	(revision 14865)
+++ trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java	(revision 14866)
@@ -284,9 +284,5 @@
     @Override
     protected void updateEnabledState() {
-        if (info.isBlacklisted()) {
-            setEnabled(false);
-        } else {
-            setEnabled(true);
-        }
+        setEnabled(!info.isBlacklisted());
     }
 
Index: trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java	(revision 14865)
+++ trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java	(revision 14866)
@@ -44,9 +44,8 @@
  */
 public class ImageryAdjustAction extends MapMode implements AWTEventListener {
-    private static volatile ImageryOffsetDialog offsetDialog;
-    private static Cursor cursor = ImageProvider.getCursor("normal", "move");
-
-    private OffsetBookmark old;
-    private OffsetBookmark tempOffset;
+    private static ImageryOffsetDialog offsetDialog;
+
+    private transient OffsetBookmark old;
+    private transient OffsetBookmark tempOffset;
     private EastNorth prevEastNorth;
     private transient AbstractTileSourceLayer<?> layer;
@@ -60,5 +59,6 @@
      */
     public ImageryAdjustAction(AbstractTileSourceLayer<?> layer) {
-        super(tr("New offset"), "adjustimg", tr("Adjust the position of this imagery layer"), cursor);
+        super(tr("New offset"), "adjustimg", tr("Adjust the position of this imagery layer"),
+                ImageProvider.getCursor("normal", "move"));
         putValue("toolbar", Boolean.FALSE);
         this.layer = layer;
@@ -118,10 +118,4 @@
         restoreOldMode = false;
         doExitMode();
-    }
-
-    private void exitModeAndRestoreOldMode() {
-        restoreOldMode = true;
-        doExitMode();
-        restoreOldMode = false;
     }
 
@@ -241,5 +235,5 @@
     private static final class ConfirmOverwriteBookmarkDialog extends ExtendedDialog {
         ConfirmOverwriteBookmarkDialog() {
-            super(MainApplication.getMainFrame(), tr("Overwrite"), new String[] {tr("Overwrite"), tr("Cancel")});
+            super(MainApplication.getMainFrame(), tr("Overwrite"), tr("Overwrite"), tr("Cancel"));
             contentInsets = new Insets(10, 15, 10, 15);
             setContent(tr("Offset bookmark already exists. Overwrite?"));
@@ -381,4 +375,10 @@
             }
         }
+
+        private void exitModeAndRestoreOldMode() {
+            restoreOldMode = true;
+            doExitMode();
+            restoreOldMode = false;
+        }
     }