diff --git a/main/faad.c b/main/faad.c
index 5966b1c0..095c566d 100644
--- a/main/faad.c
+++ b/main/faad.c
@@ -515,7 +515,6 @@ static decode_state faad_decode(void) {
 #if BYTES_PER_FRAME == 4			
 			memcpy(optr, iptr, count * BYTES_PER_FRAME);
 			iptr += count * 2;
-			optr += count * 2;
 #else 			
 			while (count--) {
 				*optr++ = *iptr++ << 8;
diff --git a/output_bt.c b/output_bt.c
index 1d5a5285..959e6a2d 100644
--- a/output_bt.c
+++ b/output_bt.c
@@ -236,7 +236,7 @@ static int _write_frames(frames_t out_frames, bool silence, s32_t gainL, s32_t g
 	{	
 		frames_t count = out_frames;
 		s32_t *_iptr = (s32_t*) outputbuf->readp;
-		s16_t *_optr = (s32_t*) optr;
+		s16_t *_optr = (s16_t*) optr;
 		while (count--) {
 			*_optr++ = *_iptr++ >> 16;
 			*_optr++ = *_iptr++ >> 16;
diff --git a/main/output_dac.c b/output_dac.c.nocompile
similarity index 100%
rename from main/output_dac.c
rename to output_dac.c.nocompile