diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.h
index e87ef16e..741cfa13 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.h
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfCamera/plCameraBrain.h
@@ -222,7 +222,7 @@ public:
 	plCameraBrain1_Drive(plCameraModifier1* pMod);
 	~plCameraBrain1_Drive();
 
-	static SetSensitivity(hsScalar f) { fTurnRate = f; }
+	static void SetSensitivity(hsScalar f) { fTurnRate = f; }
 	
 	CLASSNAME_REGISTER( plCameraBrain1_Drive );
 	GETINTERFACE_ANY( plCameraBrain1_Drive, plCameraBrain1 );
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMultiLineEditCtrl.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMultiLineEditCtrl.h
index 7193b250..70413228 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMultiLineEditCtrl.h
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameGUIMgr/pfGUIMultiLineEditCtrl.h
@@ -52,10 +52,10 @@ public:
 	virtual ~pfGUIMultiLineEditProc() {}
 
 	// we've hit the end of the control list (by moving the cursor)
-	virtual OnEndOfControlList(Int32 cursorPos) {}
+	virtual void OnEndOfControlList(Int32 cursorPos) {}
 
 	// we've hit the beginning of the control ist (by moving the cursor)
-	virtual OnBeginningOfControlList(Int32 cursorPos) {}
+	virtual void OnBeginningOfControlList(Int32 cursorPos) {}
 };
 
 class pfGUIMultiLineEditCtrl : public pfGUIControlMod
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/pfGameMgr.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/pfGameMgr.cpp
index 2cef3081..ebd80188 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/pfGameMgr.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfGameMgr/pfGameMgr.cpp
@@ -48,7 +48,7 @@ struct Factory : THashKeyVal<Uuid> {
 	const GameTypeReg &	reg;
 
 	Factory (const GameTypeReg & reg);
-	operator= (const Factory &);	// not impl
+	Factory& operator= (const Factory &);	// not impl
 };
 
 //============================================================================
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp
index 363fa9ce..7eb73037 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/FeatureLib/pfJournalBook/pfJournalBook.cpp
@@ -422,8 +422,8 @@ public:
 	pfBookMultiLineEditProc(pfBookData *owner) { bookData = owner; }
 	virtual ~pfBookMultiLineEditProc() {}
 
-	virtual OnEndOfControlList(Int32 cursorPos) { bookData->HitEndOfControlList(cursorPos); }
-	virtual OnBeginningOfControlList(Int32 cursorPos) { bookData->HitBeginningOfControlList(cursorPos); }
+	virtual void OnEndOfControlList(Int32 cursorPos) { bookData->HitEndOfControlList(cursorPos); }
+	virtual void OnBeginningOfControlList(Int32 cursorPos) { bookData->HitBeginningOfControlList(cursorPos); }
 };
 
 //// Book data class /////////////////////////////////////////////////////////
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.cpp
index 23b29a7b..e04cba49 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plAvatarTasks.cpp
@@ -424,7 +424,7 @@ hsBool plAvAnimTask::Start(plArmatureMod *avatar, plArmatureBrain *brain, double
 }
 
 // PROCESS
-plAvAnimTask::Process(plArmatureMod *avatar, plArmatureBrain *brain, double time, hsScalar elapsed)
+hsBool plAvAnimTask::Process(plArmatureMod *avatar, plArmatureBrain *brain, double time, hsScalar elapsed)
 {
 	// the only reason we need this function is to watch the animation until it fades out
 	hsBool result = false;
@@ -648,7 +648,7 @@ hsBool plAvOneShotTask::Start(plArmatureMod *avatar, plArmatureBrain *brain, dou
 }
 
 // PROCESS
-plAvOneShotTask::Process(plArmatureMod *avatar, plArmatureBrain *brain, double time, hsScalar elapsed)
+hsBool plAvOneShotTask::Process(plArmatureMod *avatar, plArmatureBrain *brain, double time, hsScalar elapsed)
 {
 	// *** if we are under mouse control, adjust it here
 
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plMatrixChannel.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plMatrixChannel.cpp
index ce96c215..496d6483 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plMatrixChannel.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plMatrixChannel.cpp
@@ -234,7 +234,7 @@ plMatrixTimeScale::~plMatrixTimeScale()
 
 // IsStoppedAt ----------------------------
 // ------------
-plMatrixTimeScale::IsStoppedAt(double time)
+hsBool plMatrixTimeScale::IsStoppedAt(double time)
 {
 	return fTimeSource->IsStoppedAt(time);
 }
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plPointChannel.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plPointChannel.cpp
index 58a20eb1..f35d332c 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plPointChannel.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plPointChannel.cpp
@@ -157,7 +157,7 @@ plPointTimeScale::~plPointTimeScale()
 
 // IsStoppedAt ---------------------------
 // ------------
-plPointTimeScale::IsStoppedAt(double time)
+hsBool plPointTimeScale::IsStoppedAt(double time)
 {
 	return fTimeSource->IsStoppedAt(time);
 }
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plQuatChannel.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plQuatChannel.cpp
index a15990a4..90440290 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plQuatChannel.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plQuatChannel.cpp
@@ -170,7 +170,7 @@ plQuatTimeScale::~plQuatTimeScale()
 {
 }
 
-plQuatTimeScale::IsStoppedAt(double time)
+hsBool plQuatTimeScale::IsStoppedAt(double time)
 {
 	return fTimeSource->IsStoppedAt(time);
 }
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plScalarChannel.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plScalarChannel.cpp
index 63433b2d..5a1c81af 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plScalarChannel.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plAvatar/plScalarChannel.cpp
@@ -180,7 +180,7 @@ plScalarTimeScale::~plScalarTimeScale()
 {
 }
 
-plScalarTimeScale::IsStoppedAt(double time)
+hsBool plScalarTimeScale::IsStoppedAt(double time)
 {
 	return fTimeSource->IsStoppedAt(time);
 }
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plWaveSet7.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plWaveSet7.cpp
index 413917e8..d2531d9c 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plWaveSet7.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plDrawable/plWaveSet7.cpp
@@ -1635,7 +1635,7 @@ plMipmap* plWaveSet7::ICreateBumpMipmapPS()
 //	const int sizeV = kCompositeSize;
 	const int sizeV = 1;
 
-	const kNumLevels = 8; // must be log2(kCompositeSize)
+	const int kNumLevels = 8; // must be log2(kCompositeSize)
 	hsAssert(kCompositeSize == (1 << kNumLevels), "Mismatch on size and num mip levels");
 
 	if( !fCosineLUT )
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/plLODMipmap.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/plLODMipmap.cpp
index eafa9181..df8d8e28 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/plLODMipmap.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/plLODMipmap.cpp
@@ -92,7 +92,7 @@ void plLODMipmap::SetLOD(int lod)
 {
 	hsAssert(fBase, "UnInitialized");
 
-	const kMaxLOD = 5;
+	const int kMaxLOD = 5;
 	if( lod > kMaxLOD )
 		lod = kMaxLOD;
 	if( lod >= fBase->GetNumLevels() )
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/plMipmap.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/plMipmap.cpp
index 166f0935..e0498f13 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/plMipmap.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plGImage/plMipmap.cpp
@@ -191,7 +191,7 @@ UInt32  plMipmap::Read( hsStream *s )
 
 	// Decide to clamp if we were told to
 	int	clampBy = fGlobalNumLevelsToChop;
-	const kMaxSkipLevels = 1;
+	const int kMaxSkipLevels = 1;
 	if( clampBy > kMaxSkipLevels )
 		clampBy = kMaxSkipLevels;
 	if( fFlags & kNoMaxSize )