diff --git a/src/display/bitmap.cpp b/src/display/bitmap.cpp
index a2caaee2..0706f036 100644
--- a/src/display/bitmap.cpp
+++ b/src/display/bitmap.cpp
@@ -169,12 +169,12 @@ struct BitmapPrivate
         unsigned long long startTime;
         unsigned long long playTime;
         
-        inline int currentFrameIRaw() {
+        inline unsigned int currentFrameIRaw() {
             if (fps <= 0) return lastFrame;
             return floor(lastFrame + (playTime / ((1 / fps) * 1000000)));
         }
         
-        int currentFrameI() {
+        unsigned int currentFrameI() {
             if (!playing || needsReset) return lastFrame;
             int i = currentFrameIRaw();
             return (loop) ? fmod(i, frames.size()) : (i > (int)frames.size() - 1) ? (int)frames.size() - 1 : i;
@@ -480,7 +480,7 @@ Bitmap::Bitmap(const char *filename)
     if (handler.gif) {
         p = new BitmapPrivate(this);
         
-        if (handler.gif->width >= glState.caps.maxTexSize || handler.gif->height > glState.caps.maxTexSize)
+        if ((uint32_t)handler.gif->width >= glState.caps.maxTexSize || (uint32_t)handler.gif->height > glState.caps.maxTexSize)
         {
             throw new Exception(Exception::MKXPError, "Animation too large (%ix%i, max %ix%i)",
                                 handler.gif->width, handler.gif->height, glState.caps.maxTexSize, glState.caps.maxTexSize);
diff --git a/src/display/graphics.cpp b/src/display/graphics.cpp
index 133f5dd9..26317871 100644
--- a/src/display/graphics.cpp
+++ b/src/display/graphics.cpp
@@ -1256,7 +1256,7 @@ void Graphics::playMovie(const char *filename, int volume, bool skippable) {
         letterbox.fillRect(0, 0, width(), height(), Vec4(0,0,0,255));
         letterboxSprite.setBitmap(&letterbox);
         
-        letterboxSprite.setZ(-999);
+        letterboxSprite.setZ(-1000);
         movieSprite.setZ(-998);
 
         movie->play();
@@ -1366,10 +1366,10 @@ void Graphics::repaintWait(const AtomicFlag &exitCond, bool checkReset) {
     GLMeta::blitSource(lastFrame);
     
     while (!exitCond) {
-        0;//shState->checkShutdown();
+        shState->checkShutdown();
         
         if (checkReset)
-            0;//shState->checkReset();
+            shState->checkReset();
         
         FBO::clear();
         p->metaBlitBufferFlippedScaled();