diff --git a/src/builder-flatpak-utils.c b/src/builder-flatpak-utils.c
index 927bdade..2b3f781f 100644
--- a/src/builder-flatpak-utils.c
+++ b/src/builder-flatpak-utils.c
@@ -1163,11 +1163,11 @@ flatpak_create_curl_session (const char *user_agent)
   if (curl_session == NULL)
     return NULL;
 
-  curl_easy_setopt (curl_session, CURLOPT_CONNECTTIMEOUT, 60);
-  curl_easy_setopt (curl_session, CURLOPT_FAILONERROR, 1);
-  curl_easy_setopt (curl_session, CURLOPT_FOLLOWLOCATION, 1);
-  curl_easy_setopt (curl_session, CURLOPT_MAXREDIRS, 50);
-  curl_easy_setopt (curl_session, CURLOPT_NOPROGRESS, 0);
+  curl_easy_setopt (curl_session, CURLOPT_CONNECTTIMEOUT, 60L);
+  curl_easy_setopt (curl_session, CURLOPT_FAILONERROR, 1L);
+  curl_easy_setopt (curl_session, CURLOPT_FOLLOWLOCATION, 1L);
+  curl_easy_setopt (curl_session, CURLOPT_MAXREDIRS, 50L);
+  curl_easy_setopt (curl_session, CURLOPT_NOPROGRESS, 0L);
   curl_easy_setopt (curl_session, CURLOPT_LOW_SPEED_TIME, 60L);
   curl_easy_setopt (curl_session, CURLOPT_LOW_SPEED_LIMIT, 10000L);
   curl_easy_setopt (curl_session, CURLOPT_USERAGENT, user_agent);
diff --git a/src/builder-utils.c b/src/builder-utils.c
index e869692e..01d981b5 100644
--- a/src/builder-utils.c
+++ b/src/builder-utils.c
@@ -1151,10 +1151,10 @@ typedef struct {
 } CURLWriteData;
 
 static gsize
-builder_curl_write_cb (gpointer *buffer,
+builder_curl_write_cb (char     *buffer,
                        gsize     size,
                        gsize     nmemb,
-                       gpointer *userdata)
+                       void     *userdata)
 {
   gsize bytes_written;
   CURLWriteData *write_data = (CURLWriteData *) userdata;