diff --git a/Sources/Plasma/CoreLib/HeadSpin.cpp b/Sources/Plasma/CoreLib/HeadSpin.cpp
index 0e39e915..ab25f06d 100644
--- a/Sources/Plasma/CoreLib/HeadSpin.cpp
+++ b/Sources/Plasma/CoreLib/HeadSpin.cpp
@@ -80,7 +80,7 @@ hsDebugMessageProc hsSetDebugMessageProc(hsDebugMessageProc newProc)
 }
 
 #ifdef HS_DEBUGGING
-void hsDebugMessage (const char message[], long val)
+void hsDebugMessage (const char* message, long val)
 {
     char    s[1024];
 
@@ -112,7 +112,7 @@ void ErrorEnableGui(bool enabled)
     s_GuiAsserts = enabled;
 }
 
-void ErrorAssert(int line, const char file[], const char fmt[], ...)
+void ErrorAssert(int line, const char* file, const char* fmt, ...)
 {
 #if defined(HS_DEBUGGING) || !defined(PLASMA_EXTERNAL_RELEASE)
     char msg[1024];
@@ -158,7 +158,7 @@ void DebugBreakIfDebuggerPresent()
 #endif // _MSC_VER
 }
 
-void DebugMsg(const char fmt[], ...)
+void DebugMsg(const char* fmt, ...)
 {
     char msg[1024];
     va_list args;
@@ -180,7 +180,7 @@ void DebugMsg(const char fmt[], ...)
 
 #ifndef PLASMA_EXTERNAL_RELEASE
 
-void hsStatusMessage(const char message[])
+void hsStatusMessage(const char* message)
 {
   if (gHSStatusProc) {
     gHSStatusProc(message);
@@ -243,7 +243,7 @@ public:
 
 bool hsMessageBox_SuppressPrompts = false;
 
-int hsMessageBoxWithOwner(hsWindowHndl owner, const char message[], const char caption[], int kind, int icon)
+int hsMessageBoxWithOwner(hsWindowHndl owner, const char* message, const char* caption, int kind, int icon)
 {
     if (hsMessageBox_SuppressPrompts)
         return hsMBoxOk;
@@ -296,7 +296,7 @@ int hsMessageBoxWithOwner(hsWindowHndl owner, const char message[], const char c
     return hsMBoxCancel;
 }
 
-int hsMessageBoxWithOwner(hsWindowHndl owner, const wchar_t message[], const wchar_t caption[], int kind, int icon)
+int hsMessageBoxWithOwner(hsWindowHndl owner, const wchar_t* message, const wchar_t* caption, int kind, int icon)
 {
     if (hsMessageBox_SuppressPrompts)
         return hsMBoxOk;
@@ -349,18 +349,18 @@ int hsMessageBoxWithOwner(hsWindowHndl owner, const wchar_t message[], const wch
     return hsMBoxCancel;
 }
 
-int hsMessageBox(const char message[], const char caption[], int kind, int icon)
+int hsMessageBox(const char* message, const char* caption, int kind, int icon)
 {
     return hsMessageBoxWithOwner((hsWindowHndl)nil,message,caption,kind,icon);
 }
 
-int hsMessageBox(const wchar_t message[], const wchar_t caption[], int kind, int icon)
+int hsMessageBox(const wchar_t* message, const wchar_t* caption, int kind, int icon)
 {
     return hsMessageBoxWithOwner((hsWindowHndl)nil,message,caption,kind,icon);
 }
 
 /**************************************/
-char* hsStrcpy(char dst[], const char src[])
+char* hsStrcpy(char* dst, const char* src)
 {
     if (src)
     {
diff --git a/Sources/Plasma/CoreLib/HeadSpin.h b/Sources/Plasma/CoreLib/HeadSpin.h
index d301a75f..5fd53a70 100644
--- a/Sources/Plasma/CoreLib/HeadSpin.h
+++ b/Sources/Plasma/CoreLib/HeadSpin.h
@@ -332,14 +332,14 @@ void SWAP (T & a, T & b) {
 #   define hsStatusMessage(x)                  NULL_STMT
 #   define hsStatusMessageF(x, ...)            NULL_STMT
 #else
-    void    hsStatusMessage(const char message[]);
+    void    hsStatusMessage(const char* message);
     void    hsStatusMessageF(const char * fmt, ...);
 #endif // PLASMA_EXTERNAL_RELEASE
 
-char*   hsStrcpy(char dstOrNil[], const char src[]);
+char*   hsStrcpy(char* dstOrNil, const char* src);
 void    hsStrLower(char *s);
 
-inline char* hsStrcpy(const char src[])
+inline char* hsStrcpy(const char* src)
 {
     return hsStrcpy(nil, src);
 }
@@ -381,10 +381,10 @@ enum {          // RETURN VALUES FROM hsMessageBox
 };
 
 extern bool hsMessageBox_SuppressPrompts;
-int hsMessageBox(const char message[], const char caption[], int kind, int icon=hsMessageBoxIconAsterisk);
-int hsMessageBox(const wchar_t message[], const wchar_t caption[], int kind, int icon=hsMessageBoxIconAsterisk);
-int hsMessageBoxWithOwner(hsWindowHndl owner, const char message[], const char caption[], int kind, int icon=hsMessageBoxIconAsterisk);
-int hsMessageBoxWithOwner(hsWindowHndl owner, const wchar_t message[], const wchar_t caption[], int kind, int icon=hsMessageBoxIconAsterisk);
+int hsMessageBox(const char* message, const char* caption, int kind, int icon=hsMessageBoxIconAsterisk);
+int hsMessageBox(const wchar_t* message, const wchar_t* caption, int kind, int icon=hsMessageBoxIconAsterisk);
+int hsMessageBoxWithOwner(hsWindowHndl owner, const char* message, const char* caption, int kind, int icon=hsMessageBoxIconAsterisk);
+int hsMessageBoxWithOwner(hsWindowHndl owner, const wchar_t* message, const wchar_t* caption, int kind, int icon=hsMessageBoxIconAsterisk);
 
 // flag testing / clearing
 #define hsCheckBits(f,c) ((f & c)==c)
@@ -449,15 +449,15 @@ extern hsDebugMessageProc gHSStatusProc;
 hsDebugMessageProc hsSetStatusMessageProc(hsDebugMessageProc newProc);
 
 void ErrorEnableGui (bool enabled);
-void ErrorAssert (int line, const char file[], const char fmt[], ...);
+void ErrorAssert (int line, const char* file, const char* fmt, ...);
 
 bool DebugIsDebuggerPresent ();
 void DebugBreakIfDebuggerPresent ();
-void DebugMsg(const char fmt[], ...);
+void DebugMsg(const char* fmt, ...);
 
 #ifdef HS_DEBUGGING
     
-    void    hsDebugMessage(const char message[], long refcon);
+    void    hsDebugMessage(const char* message, long refcon);
     #define hsDebugCode(code)                   code
     #define hsIfDebugMessage(expr, msg, ref)    (void)( ((expr) != 0) || (hsDebugMessage(msg, ref), 0) )
     #define hsAssert(expr, msg)                 (void)( ((expr) != 0) || (ErrorAssert(__LINE__, __FILE__, msg), 0) )
diff --git a/Sources/Plasma/CoreLib/hsBounds.cpp b/Sources/Plasma/CoreLib/hsBounds.cpp
index e8676994..dabd8b12 100644
--- a/Sources/Plasma/CoreLib/hsBounds.cpp
+++ b/Sources/Plasma/CoreLib/hsBounds.cpp
@@ -2208,9 +2208,11 @@ bool hsBounds3Ext::ISectBoxBS(const hsBounds3Ext &other, const hsVector3 &myVel,
     hsVector3 tstAxis;
     float tstDepth;
     int i;
+
     for( i = 0; i < 3; i++ )
     {
-        bool tryAxis;
+        bool tryAxis = false;
+
         if( other.fExtFlags & kAxisAligned )
         {
             // first try the other box axes
@@ -2223,31 +2225,28 @@ bool hsBounds3Ext::ISectBoxBS(const hsBounds3Ext &other, const hsVector3 &myVel,
                 effMin += velDist;
             effMax += fRadius;
             effMin -= fRadius;
-            
+
             if( effMax < other.fMins[i] )
                 return false;
             if( effMin > other.fMaxs[i] )
                 return false;
-            
-            if( (other.fMins[i] <= effMin)
-                &&(other.fMaxs[i] <= effMax) )
+
+            if ((other.fMins[i] <= effMin) &&
+                (other.fMaxs[i] <= effMax))
             {
                 tstDepth = other.fMaxs[i] - effMin;
                 hsAssert(tstDepth > -kRealSmall, "Late to be finding sep axis");
                 tstAxis.Set(i == 0 ? 1.f : 0, i & 1 ? 1.f : 0, i & 2 ? 1.f : 0);
                 tryAxis = true;
             }
-            else
-            if( (other.fMins[i] >= effMin)
-                &&(other.fMaxs[i] >= effMax) )
+            else if ((other.fMins[i] >= effMin) &&
+                     (other.fMaxs[i] >= effMax))
             {
                 tstDepth = effMax - other.fMins[i];
                 hsAssert(tstDepth > -kRealSmall, "Late to be finding sep axis");
                 tstAxis.Set(i == 0 ? -1.f : 0, i & 1 ? -1.f : 0, i & 2 ? -1.f : 0);
                 tryAxis = true;
             }
-            else 
-                tryAxis = false;
         }
         else
         {
@@ -2263,7 +2262,7 @@ bool hsBounds3Ext::ISectBoxBS(const hsBounds3Ext &other, const hsVector3 &myVel,
                 effMin += velDist;
             effMax += radScaled;
             effMin -= radScaled;
-            
+
             if( !(other.fExtFlags & kDistsSet) )
                 other.IMakeDists();
 
@@ -2271,24 +2270,21 @@ bool hsBounds3Ext::ISectBoxBS(const hsBounds3Ext &other, const hsVector3 &myVel,
                 return false;
             if( effMin > other.fDists[i].fY )
                 return false;
-            
-            if( centerDist <= other.fDists[i].fX )
+
+            if (centerDist <= other.fDists[i].fX)
             {
                 tstDepth = effMax - other.fDists[i].fX;
                 tstAxis = -other.fAxes[i];
                 hsAssert(tstDepth > -kRealSmall, "Late to be finding sep axis");
             }
-            else
-            if( centerDist >= other.fDists[i].fY )
+            else if (centerDist >= other.fDists[i].fY)
             {
                 tstDepth = other.fDists[i].fY - effMin;
                 tstAxis = other.fAxes[i];
                 hsAssert(tstDepth > -kRealSmall, "Late to be finding sep axis");
             }
-            else 
-                tryAxis = false;
-            
         }
+
         if( tryAxis )
         {
             float magSq = tstAxis.MagnitudeSquared();
diff --git a/Sources/Plasma/CoreLib/hsFastMath.h b/Sources/Plasma/CoreLib/hsFastMath.h
index b9ade03b..876f6179 100644
--- a/Sources/Plasma/CoreLib/hsFastMath.h
+++ b/Sources/Plasma/CoreLib/hsFastMath.h
@@ -106,13 +106,13 @@ public:
 
 inline float hsFastMath::InvSqrtAppr(float x)
 {
-    register unsigned long a = *(long*)&x;
-    register float arg = x;
+    unsigned long a = *(long*)&x;
+    float arg = x;
     union {
         long    i;
         float   f;
     } seed;
-    register float r;
+    float r;
 
     extern unsigned char statSeedTable[];
 
@@ -133,13 +133,13 @@ inline float hsFastMath::InvSqrtAppr(float x)
 
 inline float hsFastMath::InvSqrt(float x)
 {
-    register unsigned long a = *(long*)&x;
-    register float arg = x;
+    unsigned long a = *(long*)&x;
+    float arg = x;
     union {
         long    i;
         float   f;
     } seed;
-    register float r;
+    float r;
 
     extern unsigned char statSeedTable[];
 
diff --git a/Sources/Plasma/CoreLib/plFileSystem.cpp b/Sources/Plasma/CoreLib/plFileSystem.cpp
index f1d3bd62..61341c78 100644
--- a/Sources/Plasma/CoreLib/plFileSystem.cpp
+++ b/Sources/Plasma/CoreLib/plFileSystem.cpp
@@ -209,11 +209,11 @@ plFileInfo::plFileInfo(const plFileName &filename)
 
 #if HS_BUILD_FOR_WIN32
     struct __stat64 info;
-    if (!_wstat64(filename.AsString().ToWchar(), &info) == 0)
+    if (_wstat64(filename.AsString().ToWchar(), &info) != 0)
         return;
 #else
     struct stat info;
-    if (!stat(filename.AsString().c_str(), &info) == 0)
+    if (stat(filename.AsString().c_str(), &info) != 0)
         return;
 #endif