diff --git a/src/gl_context.c b/src/gl_context.c
index e22f2f9ac..700b7fce2 100644
--- a/src/gl_context.c
+++ b/src/gl_context.c
@@ -178,7 +178,7 @@ GLuint glsl_compile_link(const char *vprogram, const char *fprogram)
                 if (strlen(log) > 0) {
                         log_msg(LOG_LEVEL_INFO, "Vertex compile log: %s\n", log);
                 }
-                glGetShaderiv(fhandle, GL_COMPILE_STATUS, &status);
+                glGetShaderiv(vhandle, GL_COMPILE_STATUS, &status);
                 assert(status == GL_TRUE);
         }
 
diff --git a/src/video_capture/rtsp.c b/src/video_capture/rtsp.c
index 576e8bfad..7bc4b710d 100644
--- a/src/video_capture/rtsp.c
+++ b/src/video_capture/rtsp.c
@@ -656,7 +656,7 @@ static CURL *init_curl() {
         fprintf(stderr, "[rtsp] curl_easy_init() failed\n");
         return NULL;
     }
-    curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1);
+    my_curl_easy_setopt(curl, CURLOPT_NOSIGNAL, 1, );
     return curl;
 }
 
diff --git a/src/video_capture/screen_x11.c b/src/video_capture/screen_x11.c
index 1329cae7b..8613caf4a 100644
--- a/src/video_capture/screen_x11.c
+++ b/src/video_capture/screen_x11.c
@@ -143,8 +143,8 @@ static bool initialize(struct vidcap_screen_x11_state *s) {
         XGetWindowAttributes(s->dpy, DefaultRootWindow(s->dpy), &wa);
         s->tile->width = IF_NOT_NULL_ELSE(MIN(s->width, wa.width), wa.width);
         s->tile->height = IF_NOT_NULL_ELSE(MIN(s->height, wa.height), wa.height);
-        s->x = MAX(0, MIN(s->x, wa.width - s->tile->width));
-        s->y = MAX(0, MIN(s->y, wa.height - s->tile->height));
+        s->x = MIN(s->x, wa.width - (int) s->tile->width);
+        s->y = MIN(s->y, wa.height - (int) s->tile->height);
 
         pthread_mutex_init(&s->lock, NULL);
         pthread_cond_init(&s->boss_cv, NULL);