diff --git a/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java
index 587ac7cbc..54966c6e3 100644
--- a/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java
+++ b/trunk/src/com/jpexs/decompiler/flash/abc/types/traits/TraitClass.java
@@ -444,10 +444,7 @@ public class TraitClass extends Trait implements TraitWithSlot {
         String bodyStr = "";
         bodyIndex = abc.findBodyIndex(abc.class_info[class_info].cinit_index);
         if (bodyIndex != -1) {
-            bodyStr = abc.bodies[bodyIndex].toString(path +/*packageName +*/ "/" + abc.instance_info[class_info].getName(abc.constants).getName(abc.constants, fullyQualifiedNames) + ".staticinitializer", pcode, true, scriptIndex, class_info, abc, abc.constants, abc.method_info, new Stack<GraphTargetItem>(), true, highlight, fullyQualifiedNames, abc.class_info[class_info].static_traits);
-            if (!highlight) {
-                bodyStr = Highlighting.stripHilights(bodyStr);
-            }
+            bodyStr = abc.bodies[bodyIndex].toString(path +/*packageName +*/ "/" + abc.instance_info[class_info].getName(abc.constants).getName(abc.constants, fullyQualifiedNames) + ".staticinitializer", pcode, true, scriptIndex, class_info, abc, abc.constants, abc.method_info, new Stack<GraphTargetItem>(), true, false, fullyQualifiedNames, abc.class_info[class_info].static_traits);
         }
         if (Highlighting.stripHilights(bodyStr).trim().equals("")) {
             toPrint = ABC.addTabs(bodyStr + "/*classInitializer*/", 3);
@@ -481,10 +478,7 @@ public class TraitClass extends Trait implements TraitWithSlot {
             bodyStr = "";
             bodyIndex = abc.findBodyIndex(abc.instance_info[class_info].iinit_index);
             if (bodyIndex != -1) {
-                bodyStr = ABC.addTabs(abc.bodies[bodyIndex].toString(path +/*packageName +*/ "/" + abc.instance_info[class_info].getName(abc.constants).getName(abc.constants, fullyQualifiedNames) + ".initializer", pcode, false, scriptIndex, class_info, abc, abc.constants, abc.method_info, new Stack<GraphTargetItem>(), false, highlight, fullyQualifiedNames, abc.instance_info[class_info].instance_traits), 3);
-                if (!highlight) {
-                    bodyStr = Highlighting.stripHilights(bodyStr);
-                }
+                bodyStr = ABC.addTabs(abc.bodies[bodyIndex].toString(path +/*packageName +*/ "/" + abc.instance_info[class_info].getName(abc.constants).getName(abc.constants, fullyQualifiedNames) + ".initializer", pcode, false, scriptIndex, class_info, abc, abc.constants, abc.method_info, new Stack<GraphTargetItem>(), false, false, fullyQualifiedNames, abc.instance_info[class_info].instance_traits), 3);
                 constructorParams = abc.method_info[abc.instance_info[class_info].iinit_index].getParamStr(abc.constants, abc.bodies[bodyIndex], abc, fullyQualifiedNames);
             } else {
                 constructorParams = abc.method_info[abc.instance_info[class_info].iinit_index].getParamStr(abc.constants, null, abc, fullyQualifiedNames);
@@ -507,10 +501,7 @@ public class TraitClass extends Trait implements TraitWithSlot {
         boolean first = true;
         String glue = "\r\n\r\n";
         for (String s : outTraits) {
-            String stripped = Highlighting.stripHilights(s);
-            if(!highlight){
-                s = stripped;
-            }
+            String stripped = highlight ? Highlighting.stripHilights(s) : s;
             if (!stripped.trim().equals("")) {
                 if (s.contains("/*classInitializer*/")) {
                     s = s.replace("/*classInitializer*/", "");                    
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/GetVersionActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/GetVersionActionItem.java
index 194f68e95..ba5018a5d 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/model/GetVersionActionItem.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/model/GetVersionActionItem.java
@@ -34,7 +34,7 @@ public class GetVersionActionItem extends ActionItem {
 
     @Override
     public String toString(boolean highlight, ConstantPool constants) {
-        return hilight(")", highlight);
+        return hilight("getVersion()", highlight);
     }
 
     @Override
diff --git a/trunk/src/com/jpexs/decompiler/flash/action/model/LoadMovieActionItem.java b/trunk/src/com/jpexs/decompiler/flash/action/model/LoadMovieActionItem.java
index 49b763205..a37966574 100644
--- a/trunk/src/com/jpexs/decompiler/flash/action/model/LoadMovieActionItem.java
+++ b/trunk/src/com/jpexs/decompiler/flash/action/model/LoadMovieActionItem.java
@@ -57,7 +57,7 @@ public class LoadMovieActionItem extends ActionItem {
         if (method == 2) {
             methodStr = ",\"POST\"";
         }
-        return hilight("loadMovie", highlight) + urlString.toString(highlight, constants) + hilight(",", highlight) + targetString.toString(highlight, constants) + hilight(methodStr + ")", highlight);
+        return hilight("loadMovie(", highlight) + urlString.toString(highlight, constants) + hilight(",", highlight) + targetString.toString(highlight, constants) + hilight(methodStr + ")", highlight);
     }
 
     @Override