diff --git a/hairtunes.c b/hairtunes.c
index 73efb336..03342f0d 100644
--- a/hairtunes.c
+++ b/hairtunes.c
@@ -432,7 +432,9 @@ int init_rtp(void) {
     si.sin6_flowinfo = 0;
 #else
     si.sin_family = AF_INET;
-    si.sin_len = sizeof(si);
+    #ifdef SIN_LEN
+        si.sin_len = sizeof(si);
+    #endif
     si.sin_addr.s_addr = htonl(INADDR_ANY);
 #endif
 
@@ -639,7 +641,7 @@ int stuff_buffer(double playback_rate, short *inptr, short *outptr) {
         }
     }
 
-    return stuffsamp;
+    return frame_size + stuff;
 }
 
 void *audio_thread_func(void *arg) {