diff --git a/src/video/SDL_fillrect.c b/src/video/SDL_fillrect.c
index 72e2eefde..d891e4e9d 100644
--- a/src/video/SDL_fillrect.c
+++ b/src/video/SDL_fillrect.c
@@ -274,7 +274,7 @@ static void
 SDL_FillRect2(Uint8 * pixels, int pitch, Uint32 color, int w, int h)
 {
     int n;
-    Uint8 *p = NULL;
+    Uint16 *p = NULL;
     
     while (h--) {
         n = w;
diff --git a/src/video/x11/SDL_x11shape.c b/src/video/x11/SDL_x11shape.c
index d8ab18e92..67eeade8a 100644
--- a/src/video/x11/SDL_x11shape.c
+++ b/src/video/x11/SDL_x11shape.c
@@ -90,7 +90,7 @@ int
 X11_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shape_mode) {
     SDL_ShapeData *data = NULL;
     SDL_WindowData *windowdata = NULL;
-    Pixmap shapemask = NULL;
+    Pixmap shapemask;
     
     if(shaper == NULL || shape == NULL || shaper->driverdata == NULL)
         return -1;