diff --git a/trunk/src/com/jpexs/decompiler/flash/TagNode.java b/trunk/src/com/jpexs/decompiler/flash/TagNode.java
index 118d2112d..35e10d009 100644
--- a/trunk/src/com/jpexs/decompiler/flash/TagNode.java
+++ b/trunk/src/com/jpexs/decompiler/flash/TagNode.java
@@ -271,7 +271,7 @@ public class TagNode {
                             ret = (Highlighting.stripHilights(Action.actionsToSource(as, SWF.DEFAULT_VERSION)));
                         }
                         try (FileOutputStream fos = new FileOutputStream(f)) {
-                            fos.write(ret.getBytes());
+                            fos.write(ret.getBytes("utf-8"));
                         }
                     } catch (Exception ex) {
                     }
diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/ScriptPack.java b/trunk/src/com/jpexs/decompiler/flash/abc/ScriptPack.java
index 1345df553..2fed410bc 100644
--- a/trunk/src/com/jpexs/decompiler/flash/abc/ScriptPack.java
+++ b/trunk/src/com/jpexs/decompiler/flash/abc/ScriptPack.java
@@ -110,9 +110,9 @@ public class ScriptPack {
                 Multiname name = abc.script_info[scriptIndex].traits.traits[t].getName(abc);
                 Namespace ns = name.getNamespace(abc.constants);
                 if ((ns.kind == Namespace.KIND_PACKAGE) || (ns.kind == Namespace.KIND_PACKAGE_INTERNAL)) {
-                    fos.write(abc.script_info[scriptIndex].traits.traits[t].convertPackaged("", abcList, abc, false, pcode, scriptIndex, -1, false, new ArrayList<String>(), paralel).getBytes());
+                    fos.write(abc.script_info[scriptIndex].traits.traits[t].convertPackaged("", abcList, abc, false, pcode, scriptIndex, -1, false, new ArrayList<String>(), paralel).getBytes("utf-8"));
                 } else {
-                    fos.write(abc.script_info[scriptIndex].traits.traits[t].convert("", abcList, abc, false, pcode, scriptIndex, -1, false, new ArrayList<String>(), paralel).getBytes());
+                    fos.write(abc.script_info[scriptIndex].traits.traits[t].convert("", abcList, abc, false, pcode, scriptIndex, -1, false, new ArrayList<String>(), paralel).getBytes("utf-8"));
                 }
             }
         }
diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/gui/DecompiledEditorPane.java b/trunk/src/com/jpexs/decompiler/flash/abc/gui/DecompiledEditorPane.java
index 1450809a1..7f1c3129d 100644
--- a/trunk/src/com/jpexs/decompiler/flash/abc/gui/DecompiledEditorPane.java
+++ b/trunk/src/com/jpexs/decompiler/flash/abc/gui/DecompiledEditorPane.java
@@ -24,7 +24,6 @@ import com.jpexs.decompiler.flash.abc.avm2.instructions.AVM2Instruction;
 import com.jpexs.decompiler.flash.abc.types.ScriptInfo;
 import com.jpexs.decompiler.flash.abc.types.traits.Trait;
 import com.jpexs.decompiler.flash.abc.types.traits.TraitSlotConst;
-import com.jpexs.decompiler.flash.action.swf4.ActionPush;
 import com.jpexs.decompiler.flash.helpers.Cache;
 import com.jpexs.decompiler.flash.helpers.Highlighting;
 import com.jpexs.decompiler.flash.tags.ABCContainerTag;
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/Action.java b/trunk/src/com/jpexs/decompiler/flash/action/Action.java
index 6bd07444a..c70f99ed1 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/Action.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/Action.java
@@ -40,9 +40,9 @@ import com.jpexs.decompiler.flash.graph.NotItem;
 import com.jpexs.decompiler.flash.graph.ScriptEndItem;
 import com.jpexs.decompiler.flash.helpers.Helper;
 import com.jpexs.decompiler.flash.helpers.Highlighting;
-import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.StringReader;
 import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -1239,8 +1239,7 @@ public class Action implements GraphSourceItem {
         String s = null;
         try {
             s = Highlighting.stripHilights(Action.actionsToString(new ArrayList<DisassemblyListener>(), address, ret, null, version, false, swfPos));
-
-            ret = ASMParser.parse(address, swfPos, true, new ByteArrayInputStream(s.getBytes()), SWF.DEFAULT_VERSION);
+            ret = ASMParser.parse(address, swfPos, true, new StringReader(s), SWF.DEFAULT_VERSION);
         } catch (Exception ex) {
             Logger.getLogger(SWFInputStream.class.getName()).log(Level.SEVERE, "parsing error", ex);
         }
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/gui/ActionPanel.java b/trunk/src/com/jpexs/decompiler/flash/action/gui/ActionPanel.java
index 852fe0669..acd3c7c62 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/gui/ActionPanel.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/gui/ActionPanel.java
@@ -44,8 +44,8 @@ import java.awt.Font;
 import java.awt.Insets;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -617,7 +617,7 @@ public class ActionPanel extends JPanel implements ActionListener {
             setHex(hexButton.isSelected());
         } else if (e.getActionCommand().equals("SAVEACTION")) {
             try {
-                src.setActions(ASMParser.parse(0, src.getPos(), true, new ByteArrayInputStream(editor.getText().getBytes()), SWF.DEFAULT_VERSION), SWF.DEFAULT_VERSION);
+                src.setActions(ASMParser.parse(0, src.getPos(), true, new StringReader(editor.getText()), SWF.DEFAULT_VERSION), SWF.DEFAULT_VERSION);
                 setSource(this.src, false);
                 JOptionPane.showMessageDialog(this, "Code successfully saved");
                 saveButton.setVisible(false);
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/parser/pcode/ASMParser.java b/trunk/src/com/jpexs/decompiler/flash/action/parser/pcode/ASMParser.java
index c95ae4d24..b0d80384c 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/parser/pcode/ASMParser.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/parser/pcode/ASMParser.java
@@ -30,7 +30,7 @@ import com.jpexs.decompiler.flash.action.swf7.*;
 import com.jpexs.decompiler.flash.graph.GraphSourceItemContainer;
 import com.jpexs.decompiler.flash.helpers.Helper;
 import java.io.IOException;
-import java.io.InputStream;
+import java.io.Reader;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -331,7 +331,7 @@ public class ASMParser {
         }
     }
 
-    public static List<Action> parse(long address, long containerSWFOffset, boolean ignoreNops, InputStream is, int version) throws IOException, ParseException {
+    public static List<Action> parse(long address, long containerSWFOffset, boolean ignoreNops, Reader is, int version) throws IOException, ParseException {
         FlasmLexer lexer = new FlasmLexer(is);
         List<Label> labels = new ArrayList<>();
         List<Action> ret = parse(containerSWFOffset, ignoreNops, labels, address, lexer, new ArrayList<String>(), version);
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java b/trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java
index 8e2d42261..0519b346c 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/MainFrame.java
@@ -1438,6 +1438,7 @@ public class MainFrame extends JFrame implements ActionListener, TreeSelectionLi
                     final String identifier = actionPanel.getStringUnderCursor();
                     if (identifier != null) {
                         (new Thread() {
+                            @Override
                             public void run() {
                                 Main.startWork("Renaming...");
                                 renameIdentifier(identifier);
diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont2Tag.java
index d026aa864..aa4c32f0c 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont2Tag.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont2Tag.java
@@ -99,8 +99,8 @@ public class DefineFont2Tag extends CharacterTag implements FontTag {
             sos.writeUB(1, fontFlagsItalic ? 1 : 0);
             sos.writeUB(1, fontFlagsBold ? 1 : 0);
             sos.writeLANGCODE(languageCode);
-            sos.writeUI8(fontName.getBytes().length);
-            sos.write(fontName.getBytes());
+            sos.writeUI8(fontName.getBytes("utf-8").length);
+            sos.write(fontName.getBytes("utf-8"));
             sos.writeUI16(numGlyphs);
 
             ByteArrayOutputStream baos2 = new ByteArrayOutputStream();
diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont3Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont3Tag.java
index 4fcf09c89..e83c75dc2 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont3Tag.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFont3Tag.java
@@ -175,8 +175,8 @@ public class DefineFont3Tag extends CharacterTag implements FontTag {
             sos.writeUB(1, fontFlagsItalic ? 1 : 0);
             sos.writeUB(1, fontFlagsBold ? 1 : 0);
             sos.writeLANGCODE(languageCode);
-            sos.writeUI8(fontName.getBytes().length);
-            sos.write(fontName.getBytes());
+            sos.writeUI8(fontName.getBytes("utf-8").length);
+            sos.write(fontName.getBytes("utf-8"));
             sos.writeUI16(numGlyphs);
 
             ByteArrayOutputStream baos2 = new ByteArrayOutputStream();
diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontInfo2Tag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontInfo2Tag.java
index 4dc2009b9..33df0dd20 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontInfo2Tag.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontInfo2Tag.java
@@ -57,8 +57,8 @@ public class DefineFontInfo2Tag extends Tag {
         SWFOutputStream sos = new SWFOutputStream(os, version);
         try {
             sos.writeUI16(fontID);
-            sos.writeUI8(fontName.getBytes().length);
-            sos.write(fontName.getBytes());
+            sos.writeUI8(fontName.getBytes("utf-8").length);
+            sos.write(fontName.getBytes("utf-8"));
             sos.writeUB(2, 0);
             sos.writeUB(1, fontFlagsSmallText ? 1 : 0);
             sos.writeUB(1, fontFlagsShiftJIS ? 1 : 0);
diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontInfoTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontInfoTag.java
index 96dbe74a4..dbe1be79b 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontInfoTag.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/DefineFontInfoTag.java
@@ -55,8 +55,8 @@ public class DefineFontInfoTag extends Tag {
         SWFOutputStream sos = new SWFOutputStream(os, version);
         try {
             sos.writeUI16(fontId);
-            sos.writeUI8(fontName.getBytes().length);
-            sos.write(fontName.getBytes());
+            sos.writeUI8(fontName.getBytes("utf-8").length);
+            sos.write(fontName.getBytes("utf-8"));
             sos.writeUB(2, 0); //reserved
             sos.writeUB(1, fontFlagsSmallText ? 1 : 0);
             sos.writeUB(1, fontFlagsShiftJIS ? 1 : 0);
diff --git a/trunk/src/com/jpexs/decompiler/flash/tags/base/CharacterTag.java b/trunk/src/com/jpexs/decompiler/flash/tags/base/CharacterTag.java
index ede4bbe1c..a440443c7 100644
--- a/trunk/src/com/jpexs/decompiler/flash/tags/base/CharacterTag.java
+++ b/trunk/src/com/jpexs/decompiler/flash/tags/base/CharacterTag.java
@@ -16,11 +16,6 @@
  */
 package com.jpexs.decompiler.flash.tags.base;
 
-import com.jpexs.decompiler.flash.tags.ExportAssetsTag;
-import com.jpexs.decompiler.flash.tags.Tag;
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  *
  * @author JPEXS
diff --git a/trunk/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java b/trunk/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java
index 04dad98c3..8d937958b 100644
--- a/trunk/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java
+++ b/trunk/src/com/jpexs/decompiler/flash/xfl/XFLConverter.java
@@ -2775,8 +2775,11 @@ public class XFLConverter {
             for (String fileName : files.keySet()) {
                 writeFile(files.get(fileName), libraryDir.getAbsolutePath() + File.separator + fileName);
             }
-
-            writeFile("PROXY-CS5".getBytes(), outfile);
+            try {
+                writeFile("PROXY-CS5".getBytes("utf-8"), outfile);
+            } catch (UnsupportedEncodingException ex) {
+                Logger.getLogger(XFLConverter.class.getName()).log(Level.SEVERE, null, ex);
+            }
         }
         if (useAS3) {
             try {