diff --git a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogMod.cpp b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogMod.cpp
index cd23b9ce..694cc173 100644
--- a/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogMod.cpp
+++ b/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIDialogMod.cpp
@@ -428,7 +428,7 @@ static bool     showBounds = false;
                     float y = sH * fControls[ i ]->fBoundsPoints[ j ].fY;
                     plDebugText::Instance().DrawRect( (UInt16)(x - 2), (UInt16)(y - 2), (UInt16)(x + 2), (UInt16)(y + 2), color );
                     char str[ 16 ];
-                    itoa( j, str, 10 );
+                    snprintf(str, 16, "%d", j);
                     plDebugText::Instance().DrawString( (UInt16)(x + 8), (UInt16)(y - 8), str, color );
                 }
             }
diff --git a/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp b/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp
index 554a9e84..303b61ba 100644
--- a/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp
+++ b/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp
@@ -32,6 +32,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 //                                                                          //
 //////////////////////////////////////////////////////////////////////////////
 
+#include <wchar.h>
+
 #include "pfJournalBook.h"
 #include "hsUtils.h"
 #include "hsStlUtils.h"
diff --git a/Sources/Plasma/FeatureLib/pfPython/pyEnum.cpp b/Sources/Plasma/FeatureLib/pfPython/pyEnum.cpp
index adea87c2..f221253d 100644
--- a/Sources/Plasma/FeatureLib/pfPython/pyEnum.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/pyEnum.cpp
@@ -274,7 +274,7 @@ PyObject *EnumValue_oct(EnumValue *v)
     if (x == 0)
         strcpy(buf, "0");
     else
-        _snprintf(buf, sizeof(buf), "0%lo", x);
+        snprintf(buf, sizeof(buf), "0%lo", x);
     return PyString_FromString(buf);
 }
 
@@ -287,7 +287,7 @@ PyObject *EnumValue_hex(EnumValue *v)
         Py_INCREF(Py_NotImplemented);
         return Py_NotImplemented;
     }
-    _snprintf(buf, sizeof(buf), "0x%lx", x);
+    snprintf(buf, sizeof(buf), "0x%lx", x);
     return PyString_FromString(buf);
 }
 
diff --git a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.cpp b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.cpp
index 98663e47..59d83c9b 100644
--- a/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/pyGUIControlListBox.cpp
@@ -234,7 +234,7 @@ class pfColorListElement : public pfGUIListText
             {
                 size_t length = wcslen( fString1 ) + wcslen( fString2 ) + 3;
                 thestring = TRACKED_NEW wchar_t[ length ];
-                swprintf( thestring, length, L"%s %s", fString1, fString2 );
+                snwprintf( thestring, length, L"%s %s", fString1, fString2 );
                 wemade_string = true;
             }
             else if (fString1)