diff --git a/daemon/media_socket.c b/daemon/media_socket.c
index 73125e071..71901aeea 100644
--- a/daemon/media_socket.c
+++ b/daemon/media_socket.c
@@ -2694,10 +2694,10 @@ static int stream_packet(struct packet_handler_ctx *phc) {
 		atomic64_inc_na(&phc->mp.ssrc_in->stats->packets);
 		atomic64_add_na(&phc->mp.ssrc_in->stats->bytes, phc->s.len);
 		// no real sequencing, so this is rudimentary
-		uint64_t old_seq = atomic_get_na(&phc->mp.ssrc_in->stats->ext_seq);
-		uint64_t new_seq = ntohs(phc->mp.rtp->seq_num) | (old_seq & 0xffff0000UL);
+		unsigned int old_seq = atomic_get_na(&phc->mp.ssrc_in->stats->ext_seq);
+		unsigned int new_seq = ntohs(phc->mp.rtp->seq_num) | (old_seq & 0xffff0000UL);
 		// XXX combine this with similar code elsewhere
-		long seq_diff = new_seq - old_seq;
+		int seq_diff = new_seq - old_seq;
 		while (seq_diff < -60000) {
 			new_seq += 0x10000;
 			seq_diff += 0x10000;
diff --git a/daemon/rtp.c b/daemon/rtp.c
index b07a8bc25..283f6db7d 100644
--- a/daemon/rtp.c
+++ b/daemon/rtp.c
@@ -43,7 +43,7 @@ error:
 	return -1;
 }
 
-static uint64_t packet_index(struct ssrc_ctx *ssrc_ctx, struct rtp_header *rtp) {
+static unsigned int packet_index(struct ssrc_ctx *ssrc_ctx, struct rtp_header *rtp) {
 	uint16_t seq;
 
 	seq = ntohs(rtp->seq_num);
@@ -103,7 +103,7 @@ void rtp_append_mki(str *s, struct crypto_context *c) {
 int rtp_avp2savp(str *s, struct crypto_context *c, struct ssrc_ctx *ssrc_ctx) {
 	struct rtp_header *rtp;
 	str payload, to_auth;
-	uint64_t index;
+	unsigned int index;
 
 	if (G_UNLIKELY(!ssrc_ctx))
 		return -1;