diff --git a/src/ControlStream.c b/src/ControlStream.c
index 3abad80..c8a30e5 100644
--- a/src/ControlStream.c
+++ b/src/ControlStream.c
@@ -395,7 +395,7 @@ static bool sendMessageTcp(short ptype, short paylen, const void* payload) {
     err = send(ctlSock, (char*) packet, sizeof(*packet) + paylen, 0);
     free(packet);
 
-    if (err != sizeof(*packet) + paylen) {
+    if (err != (SOCK_RET)(sizeof(*packet) + paylen)) {
         return false;
     }
 
diff --git a/src/Input.h b/src/Input.h
index 0434876..7c56fc8 100644
--- a/src/Input.h
+++ b/src/Input.h
@@ -3,7 +3,7 @@
 #pragma pack(push, 1)
 
 typedef struct _NV_INPUT_HEADER {
-    int packetType;
+    uint32_t packetType;
 } NV_INPUT_HEADER, PNV_INPUT_HEADER;
 
 #define PACKET_TYPE_HAPTICS 0x06
diff --git a/src/VideoDepacketizer.c b/src/VideoDepacketizer.c
index 4a81487..96a14e3 100644
--- a/src/VideoDepacketizer.c
+++ b/src/VideoDepacketizer.c
@@ -492,7 +492,7 @@ static void processRtpPayload(PNV_VIDEO_PACKET videoPacket, int length,
                        uint64_t receiveTimeMs, unsigned int presentationTimeMs,
                        PLENTRY_INTERNAL* existingEntry) {
     BUFFER_DESC currentPos;
-    int frameIndex;
+    unsigned int frameIndex;
     char flags;
     unsigned int firstPacket;
     unsigned int streamPacketIndex;