diff --git a/module/Library/XML.cpp b/module/Library/XML.cpp
index fed0e095..86d336d8 100644
--- a/module/Library/XML.cpp
+++ b/module/Library/XML.cpp
@@ -263,8 +263,8 @@ void Register_XML(HSQUIRRELVM vm)
         .Prop(_SC("Next"), &XmlAttribute::NextAttribute)
         .Prop(_SC("Prev"), &XmlAttribute::PrevAttribute)
         // Member Methods
-        .Func(_SC("SetName"), &XmlAttribute::SetName)
-        .Func(_SC("SetValue"), &XmlAttribute::ApplyValue)
+        .FmtFunc(_SC("SetName"), &XmlAttribute::SetName)
+        .FmtFunc(_SC("SetValue"), &XmlAttribute::ApplyValue)
         .Func(_SC("AsString"), &XmlAttribute::AsString)
         .Func(_SC("AsInt"), &XmlAttribute::AsInt)
         .Func(_SC("AsUint"), &XmlAttribute::AsUint)
@@ -354,8 +354,8 @@ void Register_XML(HSQUIRRELVM vm)
         .Overload(_SC("AppendBuffer"), &XmlNode::AppendBuffer1)
         .Overload(_SC("AppendBuffer"), &XmlNode::AppendBuffer2)
         .Overload(_SC("AppendBuffer"), &XmlNode::AppendBuffer3)
-        .Func(_SC("SetName"), &XmlNode::SetName)
-        .Func(_SC("SetValue"), &XmlNode::ApplyValue)
+        .FmtFunc(_SC("SetName"), &XmlNode::SetName)
+        .FmtFunc(_SC("SetValue"), &XmlNode::ApplyValue)
         .Func(_SC("GetChild"), &XmlNode::Child)
         .Func(_SC("GetAttr"), &XmlNode::GetAttribute)
         .Func(_SC("GetAttribute"), &XmlNode::GetAttribute)
@@ -372,8 +372,8 @@ void Register_XML(HSQUIRRELVM vm)
         .Func(_SC("PrependAttrCopy"), &XmlNode::PrependAttrCopy)
         .Func(_SC("InsertAttrCopyAfter"), &XmlNode::InsertAttrCopyAfter)
         .Func(_SC("InsertAttrCopyBefore"), &XmlNode::InsertAttrCopyBefore)
-        .Func(_SC("AppendChild"), &XmlNode::AppendChild)
-        .Func(_SC("PrependChild"), &XmlNode::PrependChild)
+        .FmtFunc(_SC("AppendChild"), &XmlNode::AppendChild)
+        .FmtFunc(_SC("PrependChild"), &XmlNode::PrependChild)
         .Func(_SC("AppendChildNode"), &XmlNode::AppendChildNode)
         .Func(_SC("PrependChildNode"), &XmlNode::PrependChildNode)
         .Func(_SC("AppendChildType"), &XmlNode::AppendChildType)
@@ -390,9 +390,9 @@ void Register_XML(HSQUIRRELVM vm)
         .Func(_SC("PrependMove"), &XmlNode::PrependMove)
         .Func(_SC("InsertMoveAfter"), &XmlNode::InsertMoveAfter)
         .Func(_SC("InsertMoveBefore"), &XmlNode::InsertMoveBefore)
-        .Func(_SC("RemoveAttr"), &XmlNode::RemoveAttr)
+        .FmtFunc(_SC("RemoveAttr"), &XmlNode::RemoveAttr)
         .Func(_SC("RemoveAttrInst"), &XmlNode::RemoveAttrInst)
-        .Func(_SC("RemoveChild"), &XmlNode::RemoveChild)
+        .FmtFunc(_SC("RemoveChild"), &XmlNode::RemoveChild)
         .Func(_SC("RemoveChildInst"), &XmlNode::RemoveChildInst)
         .Overload(_SC("FindChildByAttr"), &XmlNode::FindChildByAttr2)
         .Overload(_SC("FindChildByAttr"), &XmlNode::FindChildByAttr3)
diff --git a/module/Library/XML.hpp b/module/Library/XML.hpp
index 471b33be..c2a5fa92 100644
--- a/module/Library/XML.hpp
+++ b/module/Library/XML.hpp
@@ -663,7 +663,7 @@ protected:
      * Explicit constructor.
     */
     XmlNode(DocumentRef doc, const Type & node)
-        : m_Doc(std::move(doc)), m_Node(node)
+        : m_Node(node), m_Doc(std::move(doc))
     {
         /* ... */
     }
@@ -671,8 +671,8 @@ protected:
 private:
 
     // ---------------------------------------------------------------------------------------------
-    DocumentRef  m_Doc{}; // The main xml document instance.
     Type         m_Node{}; // The managed document node.
+    DocumentRef  m_Doc{}; // The main xml document instance.
 
 public:
 
@@ -781,7 +781,7 @@ public:
     {
         if (!m_Node.set_name(name.mPtr))
         {
-            STHROWF("Unable to set XML node name `{s}`", name.ToStr());
+            STHROWF("Unable to set XML node name `{}`", name.ToStr());
         }
         return *this;
     }
@@ -1329,7 +1329,7 @@ public:
     {
         if (!m_Attr.set_name(name.mPtr))
         {
-            STHROWF("Unable to set XML attribute name `{s}`", name.ToStr());
+            STHROWF("Unable to set XML attribute name `{}`", name.ToStr());
         }
         return *this;
     }