diff --git a/app/src/controller.c b/app/src/controller.c
index 3a428aa8..17844c98 100644
--- a/app/src/controller.c
+++ b/app/src/controller.c
@@ -70,7 +70,7 @@ process_msg(struct controller *controller,
     if (!length) {
         return false;
     }
-    int w = net_send_all(controller->control_socket, serialized_msg, length);
+    ssize_t w = net_send_all(controller->control_socket, serialized_msg, length);
     return (size_t) w == length;
 }
 
diff --git a/app/src/server.c b/app/src/server.c
index b861ed3b..e1db2f0c 100644
--- a/app/src/server.c
+++ b/app/src/server.c
@@ -470,7 +470,7 @@ error:
 static bool
 device_read_info(socket_t device_socket, char *device_name, struct size *size) {
     unsigned char buf[DEVICE_NAME_FIELD_LENGTH + 4];
-    int r = net_recv_all(device_socket, buf, sizeof(buf));
+    ssize_t r = net_recv_all(device_socket, buf, sizeof(buf));
     if (r < DEVICE_NAME_FIELD_LENGTH + 4) {
         LOGE("Could not retrieve device information");
         return false;