diff --git a/zsnes/src/jma/inbyte.cpp b/zsnes/src/jma/inbyte.cpp
index b46d5535..f2bc3eeb 100644
--- a/zsnes/src/jma/inbyte.cpp
+++ b/zsnes/src/jma/inbyte.cpp
@@ -22,8 +22,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 namespace NStream{
 
 CInByte::CInByte(UINT32 aBufferSize):
-  m_BufferSize(aBufferSize),
-  m_BufferBase(0)
+  m_BufferBase(0),
+  m_BufferSize(aBufferSize)
 {
   m_BufferBase = new BYTE[m_BufferSize];
 }
diff --git a/zsnes/src/jma/lencoder.h b/zsnes/src/jma/lencoder.h
index 699c13bb..6cfa0a90 100644
--- a/zsnes/src/jma/lencoder.h
+++ b/zsnes/src/jma/lencoder.h
@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 namespace NLength {
 
-const int kNumPosStatesBitsMax = 4;
+const UINT32 kNumPosStatesBitsMax = 4;
 const int kNumPosStatesMax = (1 << kNumPosStatesBitsMax);
 
 
diff --git a/zsnes/src/jma/lzma.h b/zsnes/src/jma/lzma.h
index e84b5d0f..422368f9 100644
--- a/zsnes/src/jma/lzma.h
+++ b/zsnes/src/jma/lzma.h
@@ -62,7 +62,7 @@ protected:
     m_State.Init();
     m_PreviousByte = 0;
     m_PeviousIsMatch = false;
-    for(int i = 0 ; i < kNumRepDistances; i++)
+    for(UINT32 i = 0 ; i < kNumRepDistances; i++)
       m_RepDistances[i] = 0;
   }
 };
diff --git a/zsnes/src/jma/lzmadec.cpp b/zsnes/src/jma/lzmadec.cpp
index ff323cc4..8782949d 100644
--- a/zsnes/src/jma/lzmadec.cpp
+++ b/zsnes/src/jma/lzmadec.cpp
@@ -105,7 +105,7 @@ HRESULT CDecoder::Init(ISequentialInStream *anInStream,
    
   // m_RepMatchLenDecoder.Init();
 
-  for (i = 0; i < kNumLenToPosStates; i++)
+  for (i = 0; (UINT32) i < kNumLenToPosStates; i++)
     m_PosSlotDecoder[i].Init();
 
   for(i = 0; i < kNumPosModels; i++)
@@ -133,7 +133,7 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *anInStream,
   bool aPeviousIsMatch = false;
   BYTE aPreviousByte = 0;
   UINT32 aRepDistances[kNumRepDistances];
-  for(int i = 0 ; i < kNumRepDistances; i++)
+  for(UINT32 i = 0 ; i < kNumRepDistances; i++)
     aRepDistances[i] = 0;
 
   UINT64 aNowPos64 = 0;
@@ -144,7 +144,7 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *anInStream,
     while(aNowPos64 < aNext)
     {
       UINT32 aPosState = UINT32(aNowPos64) & m_PosStateMask;
-      if (m_MainChoiceDecoders[aState.m_Index][aPosState].Decode(&m_RangeDecoder) == kMainChoiceLiteralIndex)
+      if (m_MainChoiceDecoders[aState.m_Index][aPosState].Decode(&m_RangeDecoder) == (UINT32) kMainChoiceLiteralIndex)
       {
         // aCounts[0]++;
         aState.UpdateChar();
@@ -166,7 +166,7 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *anInStream,
         aPeviousIsMatch = true;
         UINT32 aDistance, aLen;
         if(m_MatchChoiceDecoders[aState.m_Index].Decode(&m_RangeDecoder) == 
-            kMatchChoiceRepetitionIndex)
+            (UINT32) kMatchChoiceRepetitionIndex)
         {
           if(m_MatchRepChoiceDecoders[aState.m_Index].Decode(&m_RangeDecoder) == 0)
           {
@@ -218,10 +218,10 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *anInStream,
           aState.UpdateMatch();
           UINT32 aPosSlot = m_PosSlotDecoder[GetLenToPosState(aLen)].Decode(&m_RangeDecoder);
           // aCounts[aPosSlot]++;
-          if (aPosSlot >= kStartPosModelIndex)
+          if (aPosSlot >= (UINT32) kStartPosModelIndex)
           {
             aDistance = kDistStart[aPosSlot];
-            if (aPosSlot < kEndPosModelIndex)
+            if (aPosSlot < (UINT32) kEndPosModelIndex)
               aDistance += m_PosDecoders[aPosSlot - kStartPosModelIndex].Decode(&m_RangeDecoder);
             else
             {
diff --git a/zsnes/src/linux/sdllink.c b/zsnes/src/linux/sdllink.c
index 7e28c9f4..a34d9e18 100644
--- a/zsnes/src/linux/sdllink.c
+++ b/zsnes/src/linux/sdllink.c
@@ -23,6 +23,9 @@
 
 #include "SDL_thread.h"
 
+#include <sys/time.h>
+#include <time.h>
+
 typedef unsigned char BYTE;
 typedef unsigned short WORD;
 typedef unsigned long DWORD;
diff --git a/zsnes/src/linux/sw_draw.c b/zsnes/src/linux/sw_draw.c
index 3f17ee57..a382b6be 100644
--- a/zsnes/src/linux/sw_draw.c
+++ b/zsnes/src/linux/sw_draw.c
@@ -38,8 +38,8 @@ void UpdateVFrame(void);
 
 BOOL sw_start(int width, int height, int req_depth, int FullScreen)
 {
-    unsigned int color32, p;
-    int i;
+    //unsigned int color32, p;
+    //int i;
     Uint32 flags = SDL_DOUBLEBUF | SDL_SWSURFACE;
     DWORD GBitMask;
     
diff --git a/zsnes/src/zip/zpng.c b/zsnes/src/zip/zpng.c
index 585f8f04..005a6b3b 100644
--- a/zsnes/src/zip/zpng.c
+++ b/zsnes/src/zip/zpng.c
@@ -169,9 +169,9 @@ char *generate_filename(void)
 	for(i=0;i<10000;i++)
 	{
 #ifdef __LINUX__
-	  sprintf(tmp, "_%04d.png\0", i);
+	  sprintf(tmp, "_%04d.png", i);
 #else
-	  sprintf(tmp, " %04d.png\0", i);
+	  sprintf(tmp, " %04d.png", i);
 #endif
 	  if(stat(filename, &buf)==-1)
 	    break;