diff --git a/modules/juce_dsp/frequency/juce_Convolution_test.cpp b/modules/juce_dsp/frequency/juce_Convolution_test.cpp
index 2096d47758..e705f9d15f 100644
--- a/modules/juce_dsp/frequency/juce_Convolution_test.cpp
+++ b/modules/juce_dsp/frequency/juce_Convolution_test.cpp
@@ -470,7 +470,7 @@ public:
                              Convolution::Stereo::no,
                              Convolution::Trim::yes,
                              Convolution::Normalise::no,
-                             AudioBlock<const float> (channels, numElementsInArray (channels), length));
+                             AudioBlock<const float> (channels, numElementsInArray (channels), (size_t) length));
         }
 
         beginTest ("IRs with extra silence are trimmed appropriately");
diff --git a/modules/juce_graphics/image_formats/juce_GIFLoader.cpp b/modules/juce_graphics/image_formats/juce_GIFLoader.cpp
index f2cd0d86b1..6b3fb0f25b 100644
--- a/modules/juce_graphics/image_formats/juce_GIFLoader.cpp
+++ b/modules/juce_graphics/image_formats/juce_GIFLoader.cpp
@@ -324,8 +324,8 @@ private:
             if (finished)
                 return -1;
 
-            buffer[0] = buffer [lastByteIndex - 2];
-            buffer[1] = buffer [lastByteIndex - 1];
+            buffer[0] = buffer [jmax (0, lastByteIndex - 2)];
+            buffer[1] = buffer [jmax (0, lastByteIndex - 1)];
 
             const int n = readDataBlock (buffer + 2);