Index: applications/editors/josm/plugins/wms-turbo-challenge2/build.xml
===================================================================
--- applications/editors/josm/plugins/wms-turbo-challenge2/build.xml	(revision 33836)
+++ applications/editors/josm/plugins/wms-turbo-challenge2/build.xml	(revision 33837)
@@ -5,5 +5,5 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="10580"/>
+    <property name="plugin.main.version" value="12643"/>
 
     <property name="plugin.author" value="Andrzej Zaborowski"/>
Index: applications/editors/josm/plugins/wms-turbo-challenge2/src/wmsturbochallenge/FakeMapView.java
===================================================================
--- applications/editors/josm/plugins/wms-turbo-challenge2/src/wmsturbochallenge/FakeMapView.java	(revision 33836)
+++ applications/editors/josm/plugins/wms-turbo-challenge2/src/wmsturbochallenge/FakeMapView.java	(revision 33837)
@@ -39,5 +39,5 @@
     FakeMapView(MapView parent, double scale) {
         // TODO: MapView constructor contains registering listeners and other code, that probably shouldn't be called in fake map view
-        super(null, null, null);
+        super(null, null);
         this.parent = parent;
         this.scale = scale;
Index: applications/editors/josm/plugins/wms-turbo-challenge2/src/wmsturbochallenge/GameWindow.java
===================================================================
--- applications/editors/josm/plugins/wms-turbo-challenge2/src/wmsturbochallenge/GameWindow.java	(revision 33836)
+++ applications/editors/josm/plugins/wms-turbo-challenge2/src/wmsturbochallenge/GameWindow.java	(revision 33837)
@@ -33,4 +33,5 @@
 import org.openstreetmap.josm.data.gpx.ImmutableGpxTrack;
 import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -63,5 +64,5 @@
 
         this.ground = ground;
-        ground_view = new FakeMapView(Main.map.mapView, 0.0000001);
+        ground_view = new FakeMapView(MainApplication.getMap().mapView, 0.0000001);
 
         /* Retrieve start position */
Index: applications/editors/josm/plugins/wms-turbo-challenge2/src/wmsturbochallenge/WMSRacer.java
===================================================================
--- applications/editors/josm/plugins/wms-turbo-challenge2/src/wmsturbochallenge/WMSRacer.java	(revision 33836)
+++ applications/editors/josm/plugins/wms-turbo-challenge2/src/wmsturbochallenge/WMSRacer.java	(revision 33837)
@@ -11,6 +11,6 @@
 import javax.swing.JMenuItem;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -32,5 +32,5 @@
         driveAction.updateEnabledState();
 
-        JMenu toolsMenu = Main.main.menu.toolsMenu;
+        JMenu toolsMenu = MainApplication.getMenu().toolsMenu;
         toolsMenu.addSeparator();
         toolsMenu.add(new JMenuItem(driveAction));
@@ -105,6 +105,6 @@
     public void mapFrameInitialized(MapFrame oldFrame, MapFrame newFrame) {
         if (oldFrame != null) {
-            Main.getLayerManager().removeLayerChangeListener(this);
-            Main.getLayerManager().removeActiveLayerChangeListener(this);
+            MainApplication.getLayerManager().removeLayerChangeListener(this);
+            MainApplication.getLayerManager().removeActiveLayerChangeListener(this);
         }
 
@@ -113,6 +113,6 @@
 
         if (newFrame != null) {
-            Main.getLayerManager().addLayerChangeListener(this);
-            Main.getLayerManager().addActiveLayerChangeListener(this);
+            MainApplication.getLayerManager().addLayerChangeListener(this);
+            MainApplication.getLayerManager().addActiveLayerChangeListener(this);
         }
     }
@@ -120,5 +120,5 @@
     @Override
     public void activeOrEditLayerChanged(ActiveLayerChangeEvent e) {
-        driveAction.currentLayer = Main.getLayerManager().getActiveLayer();
+        driveAction.currentLayer = MainApplication.getLayerManager().getActiveLayer();
         driveAction.updateEnabledState();
     }