diff --git a/Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizationDataMgr.cpp b/Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizationDataMgr.cpp
index 125a0f61..d47d19e8 100644
--- a/Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizationDataMgr.cpp
+++ b/Sources/Plasma/FeatureLib/pfLocalizationMgr/pfLocalizationDataMgr.cpp
@@ -935,7 +935,7 @@ void pfLocalizationDataMgr::IWriteText(const plFileName & filename, const plStri
 
     // we will try to pretty print it all so it's easy to read for the devs
     plStringStream fileData;
-    fileData << "<?xml version=\"1.0\" encoding=\"utf-16\"?>\n"; // stores the xml we are going to write to the file (UTF-16 format)
+    fileData << "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
     fileData << "<localizations>\n";
     fileData << plString::Format("\t<age name=\"%s\">\n", ageName.c_str());
 
@@ -977,7 +977,7 @@ void pfLocalizationDataMgr::IWriteText(const plFileName & filename, const plStri
     {
         // now spit the results out to the file
         hsStream *xmlStream = plEncryptedStream::OpenEncryptedFileWrite(filename);
-        xmlStream->Write(fileData.GetLength(), fileData.GetString().c_str());
+        xmlStream->Write(fileData.GetLength(), fileData.GetRawBuffer());
         xmlStream->Close();
         delete xmlStream;
     }
diff --git a/Sources/Tools/plLocalizationEditor/plLocTreeView.cpp b/Sources/Tools/plLocalizationEditor/plLocTreeView.cpp
index f6e5b1fd..75373fd0 100644
--- a/Sources/Tools/plLocalizationEditor/plLocTreeView.cpp
+++ b/Sources/Tools/plLocalizationEditor/plLocTreeView.cpp
@@ -66,7 +66,7 @@ HTREEITEM AddLeaf(HWND hTree, HTREEITEM hParent, plString text, bool sort = true
     TVITEM tvi = {0};
     tvi.mask = TVIF_TEXT | TVIF_PARAM;
     tvi.pszText = const_cast<LPWSTR>(buf.GetData());
-    tvi.cchTextMax = static_cast<int>(text.GetSize());
+    tvi.cchTextMax = static_cast<int>(buf.GetSize());
     tvi.lParam = NULL;
 
     TVINSERTSTRUCT tvins = {0};