diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4950c6c16..89f527388 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,6 @@ All notable changes to this project will be documented in this file.
 - Due to Java9+ limited support of reflection, following features were removed:
 - Automatic detection of installed fonts changes (on font editation) - FFDec needs to be restarted to font changes to take effect
 - Using kerning pairs of installed fonts
-- XML import/export
 - Raw editation of tags 
 - Generic editation of tags through treeview (affects tags like FileAttributes, ExportAssets)
 - Support for installing java in FFDec windows installer
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/Multiname.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/Multiname.java
index dc6bb24c0..80e27fcb6 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/Multiname.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/types/Multiname.java
@@ -12,7 +12,8 @@
  * Lesser General Public License for more details.
  * 
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library.
 */
+ * License along with this library.
+ */
 package com.jpexs.decompiler.flash.abc.types;
 
 import com.jpexs.decompiler.flash.IdentifiersDeobfuscation;
@@ -63,11 +64,11 @@ public class Multiname {
 
     public int namespace_index;
 
-    public final int namespace_set_index;
+    public /*final JAVA 9*/ int namespace_set_index;
 
-    public final int qname_index; //for TypeName
+    public /*final JAVA 9*/ int qname_index; //for TypeName
 
-    public final int[] params; //for TypeName
+    public /*final JAVA 9*/ int[] params; //for TypeName
 
     @Internal
     public boolean deleted;
diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/FontTag.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/FontTag.java
index 22d8ca46f..e7b09d667 100644
--- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/FontTag.java
+++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/tags/base/FontTag.java
@@ -285,9 +285,7 @@ public abstract class FontTag extends DrawableTag implements AloneTag {
         } else if (installedFontsByFamily.containsKey("Arial")) {
             defaultFontName = "Arial";
         } else {
-            //NOT AVAILABLE SINCE JAVA9+
-            //defaultFontName = installedFontsByFamily.keySet().iterator().next();
-            defaultFontName = "Dialog";
+            defaultFontName = installedFontsByFamily.keySet().iterator().next();
         }
     }
 
diff --git a/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java b/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
index fc95982a3..a3ab227c2 100644
--- a/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
+++ b/src/com/jpexs/decompiler/flash/console/CommandLineArgumentParser.java
@@ -443,7 +443,6 @@ public class CommandLineArgumentParser {
             out.println("  ...Decompress <infile> and save it to <outfile>");
         }
 
-        /* UNAVAILABLE IN JAVA9+
         if (filter == null || filter.equals("swf2xml")) {
             out.println(" " + (cnt++) + ") -swf2xml <infile> <outfile>");
             out.println("  ...Converts the <infile> SWF to <outfile> XML file");
@@ -452,7 +451,7 @@ public class CommandLineArgumentParser {
         if (filter == null || filter.equals("xml2swf")) {
             out.println(" " + (cnt++) + ") -xml2swf <infile> <outfile>");
             out.println("  ...Converts the <infile> XML to <outfile> SWF file");
-        }*/
+        }
 
         if (filter == null || filter.equals("extract")) {
             out.println(" " + (cnt++) + ") -extract <infile> [-o <outpath>|<outfile>] [nocheck] [(all|biggest|smallest|first|last)]");
@@ -894,12 +893,11 @@ public class CommandLineArgumentParser {
             parseCompress(args);
         } else if (command.equals("decompress")) {
             parseDecompress(args);
-        } else/*  UNAVAILABLE IN JAVA9+
-            if (command.equals("swf2xml")) {
+        } else if (command.equals("swf2xml")) {
             parseSwf2Xml(args);
         } else if (command.equals("xml2swf")) {
             parseXml2Swf(args);
-        } else*/ if (command.equals("extract")) {
+        } else if (command.equals("extract")) {
             parseExtract(args);
         } else if (command.equals("memorysearch")) {
             parseMemorySearch(args);
diff --git a/src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java b/src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java
index 03ee60156..de08c62d6 100644
--- a/src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java
+++ b/src/com/jpexs/decompiler/flash/gui/MainFrameMenu.java
@@ -724,13 +724,13 @@ public abstract class MainFrameMenu implements MenuBuilder {
         setMenuEnabled("/file/export/exportFla", swfSelected && !isWorking);
         setMenuEnabled("_/exportSelected", swfSelected && !isWorking);
         setMenuEnabled("/file/export/exportSelected", swfSelected && !isWorking);
-        setMenuEnabled("/file/export/exportXml", false /*NOT AVAILABLE IN JAVA9+*/); //swfSelected && !isWorking);
+        setMenuEnabled("/file/export/exportXml", swfSelected && !isWorking);
 
         setMenuEnabled("/file/import", swfSelected);
         setMenuEnabled("/file/import/importText", swfSelected && !isWorking);
         setMenuEnabled("/file/import/importScript", swfSelected && !isWorking);
         setMenuEnabled("/file/import/importSymbolClass", swfSelected && !isWorking);
-        setMenuEnabled("/file/import/importXml", false /*NOT AVAILABLE IN JAVA9+*/); //swfSelected && !isWorking);
+        setMenuEnabled("/file/import/importXml", swfSelected && !isWorking);
 
         setMenuEnabled("/tools/deobfuscation", swfSelected);
         setMenuEnabled("/tools/deobfuscation/renameOneIdentifier", swfSelected && !isWorking);