diff --git a/libs/UIX.DecompXml/Decompiler.cs b/libs/UIX.DecompXml/Decompiler.cs
index 260fdc8..c8d34ff 100644
--- a/libs/UIX.DecompXml/Decompiler.cs
+++ b/libs/UIX.DecompXml/Decompiler.cs
@@ -3,6 +3,7 @@ using Microsoft.Iris.DecompXml.Mock;
 using Microsoft.Iris.Markup;
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Text;
 using System.Xml;
@@ -224,7 +225,7 @@ public class Decompiler
             bool b => b ? "true" : "false",
             IStringEncodable strEnc => strEnc.EncodeString(),
             IrisExpression expr => '{' + expr.Decompile(_context) + '}',
-            Enum en => en.ToString(),
+            IFormattable formattable => formattable.ToString(null, CultureInfo.InvariantCulture),
 
             Layout.ILayout layoutObj
                 when Layout.PredefinedLayouts.TryConvertToString(layoutObj, out var layoutName)
@@ -264,7 +265,7 @@ public class Decompiler
         switch (xfValue)
         {
             case XElement xValue:
-                var xProperty = GetOrCreateElement(xTarget, property.Name);
+                var xProperty = GetOrCreateElement(xTarget, _nsUix + property.Name);
                 xProperty.Add(xValue);
                 return xProperty;
 
diff --git a/test/ABOUTDIALOG.31_48_decomp.uix b/test/ABOUTDIALOG.31_48_decomp.uix
index 7db5818..05a6e72 100644
--- a/test/ABOUTDIALOG.31_48_decomp.uix
+++ b/test/ABOUTDIALOG.31_48_decomp.uix
@@ -9,21 +9,21 @@
     </Properties>
   </Class>
   <UI Name="AboutDialogContentUI" Base="dialog:DialogContentUI">
-    <Content xmlns="">
-      <Panel MaximumSize="360, 0" xmlns="http://schemas.microsoft.com/2007/uix">
-        <Layout xmlns="">
-          <FlowLayout DefaultChildAlignment="Near" Orientation="Vertical" xmlns="http://schemas.microsoft.com/2007/uix" />
+    <Content>
+      <Panel MaximumSize="360, 0">
+        <Layout>
+          <FlowLayout DefaultChildAlignment="Near" Orientation="Vertical" />
         </Layout>
         <Children>
           <Panel Margins="10">
-            <Layout xmlns="">
-              <FlowLayout Orientation="Horizontal" xmlns="http://schemas.microsoft.com/2007/uix" />
+            <Layout>
+              <FlowLayout Orientation="Horizontal" />
             </Layout>
             <Children>
               <Graphic Content="{styles:Styles.IconZuneAbout}" StretchingPolicy="Uniform" SizingPolicy="SizeToContent" />
               <Panel Margins="10, 10, 0, 10">
-                <Layout xmlns="">
-                  <DockLayout DefaultLayoutInput="Top" xmlns="http://schemas.microsoft.com/2007/uix" />
+                <Layout>
+                  <DockLayout DefaultLayoutInput="Top" />
                 </Layout>
                 <Children>
                   <label:Label Content="{zuneUI:Shell.LoadString(zuneUI:StringId.IDS_ABOUTDIALOG_COPYRIGHT_LINE1)}" Style="{styles:SharedStyles.DialogTextStyle}" />