diff --git a/server/red_worker.c b/server/red_worker.c
index 7fc1b967..b8d6a962 100644
--- a/server/red_worker.c
+++ b/server/red_worker.c
@@ -8460,7 +8460,7 @@ static inline void red_create_surface(RedWorker *worker, uint32_t surface_id, ui
     surface->context.stride = stride;
     surface->context.line_0 = line_0;
     if (!data_is_valid) {
-        memset(line_0 + (int32_t)(stride * (height - 1)), 0, height*abs(stride));
+        memset((char *)line_0 + (int32_t)(stride * (height - 1)), 0, height*abs(stride));
     }
     surface->create.info = NULL;
     surface->destroy.info = NULL;
diff --git a/server/reds.c b/server/reds.c
index 5927a69d..5fa50c14 100644
--- a/server/reds.c
+++ b/server/reds.c
@@ -1766,7 +1766,7 @@ static ssize_t reds_stream_sasl_write(RedsStream *s, const void *buf, size_t nby
     return -1;
 }
 
-static ssize_t reds_stream_sasl_read(RedsStream *s, void *buf, size_t nbyte)
+static ssize_t reds_stream_sasl_read(RedsStream *s, uint8_t *buf, size_t nbyte)
 {
     uint8_t encoded[4096];
     const char *decoded;