diff --git a/Source/Glide64/3dmath.cpp b/Source/Glide64/3dmath.cpp
index 649efab41..51bd0ae6d 100644
--- a/Source/Glide64/3dmath.cpp
+++ b/Source/Glide64/3dmath.cpp
@@ -387,8 +387,8 @@ void MulMatricesSSE(float m1[4][4],float m2[4][4],float r[4][4])
   {
 #ifndef _DEBUG
     int IsSSE = FALSE;
-    int edx, eax;
 #if defined(__GNUC__) && !defined(NO_ASM) && !defined(NOSSE)
+    int edx, eax;
     GLIDE64_TRY
     {
   #if defined(__x86_64__)
diff --git a/Source/GlideHQ/TxImage.cpp b/Source/GlideHQ/TxImage.cpp
index ba087d862..27bb4d1a3 100644
--- a/Source/GlideHQ/TxImage.cpp
+++ b/Source/GlideHQ/TxImage.cpp
@@ -496,7 +496,8 @@ TxImage::readBMP(FILE* fp, int* width, int* height, uint16* format)
   uint8 *image = NULL;
   uint8 *image_row = NULL;
   uint8 *tmpimage = NULL;
-  int row_bytes, pos, i, j;
+  unsigned int row_bytes, pos;
+  int i, j;
   /* Windows Bitmap */
   BITMAPFILEHEADER bmp_fhdr;
   BITMAPINFOHEADER bmp_ihdr;
@@ -560,7 +561,7 @@ TxImage::readBMP(FILE* fp, int* width, int* height, uint16* format)
         fseek(fp, pos, SEEK_SET);
         fread(image_row, row_bytes, 1, fp);
         /* expand 4bpp to 8bpp. stuff 4bit values into 8bit comps. */
-        for (j = 0; j < row_bytes; j++) {
+        for (j = 0; j < (int) row_bytes; j++) {
           tmpimage[j << 1] = image_row[j] & 0x0f;
           tmpimage[(j << 1) + 1] = (image_row[j] & 0xf0) >> 4;
         }