diff --git a/src/dsd_main.c b/src/dsd_main.c
index edae7a6..7644a8c 100644
--- a/src/dsd_main.c
+++ b/src/dsd_main.c
@@ -1378,8 +1378,8 @@ if (opts->audio_out_type == 0)
 }
 
 #ifdef AERO_BUILD
-//TODO: Investigate why getSymbol needs to be run first in this context...truly confused here
-if(opts->frame_m17 == 1) //&& opts->audio_in_type == 5
+//TODO: More Random Cygwin Related M17 Bugs to sort out
+if(opts->frame_m17 == 1 && opts->audio_in_type != 0)
   for (int i = 0; i < 960; i++) getSymbol(opts, state, 1); //I think this is actually just framesync being a pain
 #endif
 
diff --git a/src/m17.c b/src/m17.c
index bcefb7a..36069fa 100644
--- a/src/m17.c
+++ b/src/m17.c
@@ -596,8 +596,8 @@ void processM17STR(dsd_opts * opts, dsd_state * state)
 {
 
   int i, x;
-
-  uint8_t dbuf[184]; //384-bit frame - 16-bit (8 symbol) sync pattern (184 dibits)
+  //overflow/memory issue returns in Cygwin for...reasons...
+  uint8_t dbuf[384]; //384-bit frame - 16-bit (8 symbol) sync pattern (184 dibits)
   uint8_t m17_rnd_bits[368]; //368 bits that are still scrambled (randomized)
   uint8_t m17_int_bits[368]; //368 bits that are still interleaved
   uint8_t m17_bits[368]; //368 bits that have been de-interleaved and de-scramble