diff --git a/Makefile b/Makefile
index 546bd900..1b119446 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 PKGFLAGS:=$(shell pkg-config --cflags --libs openssl ao)
-CFLAGS:=-O0
+CFLAGS:=-O2
 LDFLAGS:=-lm -lpthread
 PAUFLAGS:=-lportaudio
 
diff --git a/hairtunes.c b/hairtunes.c
index d637d653..60817f95 100644
--- a/hairtunes.c
+++ b/hairtunes.c
@@ -628,6 +628,8 @@ int stuff_buffer(double playback_rate, short *inptr, short *outptr) {
             *outptr++ = dithered_vol(*inptr++);
         }
     }
+
+    return stuffsamp;
 }
 
 void *audio_thread_func(void *arg) {