Index: /applications/editors/josm/plugins/FixAddresses/build.xml
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/build.xml	(revision 32444)
+++ /applications/editors/josm/plugins/FixAddresses/build.xml	(revision 32445)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="[josm_fixadresses]: Fixes #josm8336"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="7001"/>
+    <property name="plugin.main.version" value="10353"/>
 	
     <!-- Configure these properties (replace "..." accordingly).
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java	(revision 32444)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/AddressEditContainer.java	(revision 32445)
@@ -489,6 +489,6 @@
             invalidate(workingSet);
         } else {
-            if (Main.main.getCurrentDataSet() != null) {
-                invalidate(Main.main.getCurrentDataSet().allPrimitives());
+            if (Main.getLayerManager().getEditDataSet() != null) {
+                invalidate(Main.getLayerManager().getEditDataSet().allPrimitives());
             }
         }
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java	(revision 32444)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/FixUnresolvedStreetsAction.java	(revision 32445)
@@ -59,5 +59,5 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(getCurrentDataSet() != null);
+        setEnabled(getLayerManager().getEditDataSet() != null);
     }
 
@@ -67,5 +67,5 @@
         // Enable button if there is either a selection or at least a data set
         setEnabled( selection != null && !selection.isEmpty() ||
-                    (getCurrentDataSet() != null));
+                    (getLayerManager().getEditDataSet() != null));
     }
 
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessAddressRunnable.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessAddressRunnable.java	(revision 32444)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessAddressRunnable.java	(revision 32445)
@@ -119,5 +119,5 @@
     OsmTransferException {
 
-        if (Main.main.getCurrentDataSet() == null || addressesToGuess == null) return;
+        if (Main.getLayerManager().getEditDataSet() == null || addressesToGuess == null) return;
 
         isRunning = true;
@@ -152,5 +152,5 @@
 
                     // visit osm data
-                    for (Way way : Main.main.getCurrentDataSet().getWays()) {
+                    for (Way way : Main.getLayerManager().getEditDataSet().getWays()) {
                         if (canceled) {
                             break;
@@ -172,5 +172,5 @@
 
                     // visit osm data
-                    for (Node node : Main.main.getCurrentDataSet().getNodes()) {
+                    for (Node node : Main.getLayerManager().getEditDataSet().getNodes()) {
                         if (canceled) {
                             break;
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java	(revision 32444)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectAddressesInMapAction.java	(revision 32445)
@@ -64,5 +64,5 @@
         List<OsmPrimitive> sel = new ArrayList<>();
 
-        getCurrentDataSet().clearSelection();
+        getLayerManager().getEditDataSet().clearSelection();
         for (OSMAddress aNode : addrToSel) {
             sel.add(aNode.getOsmObject());
@@ -76,5 +76,5 @@
         }
 
-        getCurrentDataSet().setSelected(sel);
+        getLayerManager().getEditDataSet().setSelected(sel);
     }
 
Index: /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectIncompleteAddressesAction.java
===================================================================
--- /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectIncompleteAddressesAction.java	(revision 32444)
+++ /applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/gui/actions/SelectIncompleteAddressesAction.java	(revision 32445)
@@ -35,5 +35,5 @@
                 osms.add(aNode.getOsmObject());
             }
-            getCurrentDataSet().setSelected(osms);
+            getLayerManager().getEditDataSet().setSelected(osms);
         }
     }
@@ -41,5 +41,5 @@
     @Override
     protected void updateEnabledState() {
-        setEnabled(getCurrentDataSet() != null);
+        setEnabled(getLayerManager().getEditDataSet() != null);
     }
 }