diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.cpp b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.cpp
index a1d9533d..26c53632 100644
--- a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.cpp
@@ -47,6 +47,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "pyGameCli.h"
 #include "pfGameMgr/pfGameMgr.h"
+#include "pnUUID/pnUUID.h"
 
 #include "TicTacToe/pyTTTGame.h"
 #include "Heek/pyHeekGame.h"
@@ -104,7 +105,7 @@ plUUID pyGameCli::GameTypeID() const
 {
     if (gameClient)
     {
-        return plUUID(gameClient->GetGameTypeId());
+        return gameClient->GetGameTypeId();
     }
     return kNilUuid;
 }
diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.h b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.h
index db9dad4e..128f1adc 100644
--- a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.h
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCli.h
@@ -52,10 +52,10 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "../pyGlueHelpers.h"
 #include <string>
 #include <vector>
-#include "pnUUID/pnUUID.h"
 
 class pfGameCli;
 class plString;
+class plUUID;
 
 class pyGameCli
 {
diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliGlue.cpp
index c0d3b37d..e6707216 100644
--- a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliGlue.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameCliGlue.cpp
@@ -44,6 +44,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "../pyKey.h"
 #pragma hdrstop
 
+#include "pnUUID/pnUUID.h"
 #include "pyGameCli.h"
 #include "../pyEnum.h"
 
diff --git a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.cpp b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.cpp
index 07f91329..87e41dd8 100644
--- a/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/Games/pyGameMgrMsg.cpp
@@ -109,7 +109,7 @@ plUUID pyGameMgrInviteReceivedMsg::GameTypeID() const
     if (message)
     {
         const Srv2Cli_GameMgr_InviteReceived* gmMsg = (const Srv2Cli_GameMgr_InviteReceived*)message->netMsg;
-        return plUUID(gmMsg->gameTypeId);
+        return gmMsg->gameTypeId;
     }
     return kNilUuid;
 }
@@ -148,7 +148,7 @@ plUUID pyGameMgrInviteRevokedMsg::GameTypeID() const
     if (message)
     {
         const Srv2Cli_GameMgr_InviteRevoked* gmMsg = (const Srv2Cli_GameMgr_InviteRevoked*)message->netMsg;
-        return plUUID(gmMsg->gameTypeId);
+        return gmMsg->gameTypeId;
     }
     return kNilUuid;
 }
diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNotify.cpp b/Sources/Plasma/FeatureLib/pfPython/pyNotify.cpp
index b435ebf7..8cab9ab0 100644
--- a/Sources/Plasma/FeatureLib/pfPython/pyNotify.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/pyNotify.cpp
@@ -141,7 +141,7 @@ void pyNotify::AddVarNumber(const char* name, float number)
     fBuildMsg.AddVariableEvent(name, number);
 }
 
-void pyNotify::AddVarNumber(const char* name, int number)
+void pyNotify::AddVarNumber(const char* name, int32_t number)
 {
     fBuildMsg.AddVariableEvent(name, number);
 }
diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNotify.h b/Sources/Plasma/FeatureLib/pfPython/pyNotify.h
index c2179a2d..81f71eea 100644
--- a/Sources/Plasma/FeatureLib/pfPython/pyNotify.h
+++ b/Sources/Plasma/FeatureLib/pfPython/pyNotify.h
@@ -97,7 +97,7 @@ public:
     virtual void AddPickEvent(bool enabled, pyKey* other, pyKey* self, pyPoint3 hitPoint);
     virtual void AddControlKeyEvent( int32_t key, bool down );
     virtual void AddVarNumber(const char* name, float number);
-    virtual void AddVarNumber(const char* name, int number);
+    virtual void AddVarNumber(const char* name, int32_t number);
     virtual void AddVarNull(const char* name);
     virtual void AddVarKey(const char* name, pyKey* key);
     virtual void AddFacingEvent( bool enabled, pyKey* other, pyKey* self, float dot);
diff --git a/Sources/Plasma/FeatureLib/pfPython/pyNotifyGlue.cpp b/Sources/Plasma/FeatureLib/pfPython/pyNotifyGlue.cpp
index e23e931f..5e965361 100644
--- a/Sources/Plasma/FeatureLib/pfPython/pyNotifyGlue.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/pyNotifyGlue.cpp
@@ -210,14 +210,14 @@ PYTHON_METHOD_DEFINITION(ptNotify, addVarNumber, args)
     if (number == NULL || number == Py_None)
         self->fThis->AddVarNull(name);
     else if (PyInt_Check(number))
-        self->fThis->AddVarNumber(name, (int)PyInt_AsLong(number));
+        self->fThis->AddVarNumber(name, static_cast<int32_t>(PyInt_AsLong(number)));
     else if (PyLong_Check(number))
     {
         // try as int first
         long i = PyLong_AsLong(number);
         if (!PyErr_Occurred())
         {
-            self->fThis->AddVarNumber(name, (int)i);
+            self->fThis->AddVarNumber(name, static_cast<int32_t>(i));
         }
         else
         {
diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.cpp
index 2901d681..655d6ae0 100644
--- a/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultMarkerGameNode.cpp
@@ -93,7 +93,7 @@ plUUID pyVaultMarkerGameNode::GetGameGuid() const
 {
     if (fNode) {
         VaultMarkerGameNode access(fNode);
-        return plUUID(access.gameGuid);
+        return access.gameGuid;
     }
     return kNilUuid;
 }
diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.cpp
index baeee32e..bc22584c 100644
--- a/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultNode.cpp
@@ -325,7 +325,7 @@ const char * pyVaultNode::GetCreateAgeName( void )
 plUUID pyVaultNode::GetCreateAgeGuid(void) const
 {
     if (fNode) {
-        return plUUID(fNode->createAgeUuid);
+        return fNode->createAgeUuid;
     }
 
     return kNilUuid;
diff --git a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNode.cpp b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNode.cpp
index 15547e56..d93e87c0 100644
--- a/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNode.cpp
+++ b/Sources/Plasma/FeatureLib/pfPython/pyVaultPlayerInfoNode.cpp
@@ -162,7 +162,7 @@ plUUID pyVaultPlayerInfoNode::Player_GetAgeGuid(void) const
 {
     if (fNode) {
         VaultPlayerInfoNode playerInfo(fNode);
-        return plUUID(playerInfo.ageInstUuid);
+        return playerInfo.ageInstUuid;
     }
     return kNilUuid;
 }
diff --git a/Sources/Plasma/NucleusLib/pnMessage/plNotifyMsg.cpp b/Sources/Plasma/NucleusLib/pnMessage/plNotifyMsg.cpp
index f29bb387..9c829a7d 100644
--- a/Sources/Plasma/NucleusLib/pnMessage/plNotifyMsg.cpp
+++ b/Sources/Plasma/NucleusLib/pnMessage/plNotifyMsg.cpp
@@ -607,7 +607,7 @@ void plNotifyMsg::AddVariableEvent( const char* name, float number )
 //
 //  PURPOSE    : Add a variable event record to this notify message
 //
-void plNotifyMsg::AddVariableEvent( const char* name, int number )
+void plNotifyMsg::AddVariableEvent( const char* name, int32_t number )
 {
     // create the control key event record
     proVariableEventData* pED = new proVariableEventData;
diff --git a/Sources/Plasma/NucleusLib/pnMessage/plNotifyMsg.h b/Sources/Plasma/NucleusLib/pnMessage/plNotifyMsg.h
index 2b233db8..114d3f76 100644
--- a/Sources/Plasma/NucleusLib/pnMessage/plNotifyMsg.h
+++ b/Sources/Plasma/NucleusLib/pnMessage/plNotifyMsg.h
@@ -376,7 +376,7 @@ public:
     void AddPickEvent( const plKey &other, const plKey& self, bool enabled, hsPoint3 hitPoint );
     void AddControlKeyEvent( int32_t key, bool down );
     void AddVariableEvent( const char* name, float number );
-    void AddVariableEvent( const char* name, int number );
+    void AddVariableEvent( const char* name, int32_t number );
     void AddVariableEvent( const char* name );
     void AddVariableEvent( const char *name, const plKey &key );
     void AddFacingEvent( const plKey &other, const plKey &self, float dot, bool enabled);
diff --git a/Sources/Plasma/NucleusLib/pnUUID/pnUUID_Unix.cpp b/Sources/Plasma/NucleusLib/pnUUID/pnUUID_Unix.cpp
index 2b1a5a41..565fbc51 100644
--- a/Sources/Plasma/NucleusLib/pnUUID/pnUUID_Unix.cpp
+++ b/Sources/Plasma/NucleusLib/pnUUID/pnUUID_Unix.cpp
@@ -67,7 +67,6 @@ struct plUUIDHelper
 void plUUID::Clear()
 {
     uuid_t g;
-    //plUUIDHelper::CopyToNative( g, this );
     uuid_clear( g );
     plUUIDHelper::CopyToPlasma( this, g );
 }