diff --git a/src/dmr_block.c b/src/dmr_block.c
index 0f2ba99..9c39bca 100644
--- a/src/dmr_block.c
+++ b/src/dmr_block.c
@@ -132,7 +132,7 @@ void dmr_dheader (dsd_opts * opts, dsd_state * state, uint8_t dheader[], uint8_t
     udt_uab += 1; //add 1 internally, up to 4 appended blocks are carried, min is 1
 
     //NMEA Specific Fix for unspecified MFID format w/ 2 appended blocks (UAB 2) p291
-    if (udt_uab == 0x5 && udt_uab == 3)
+    if (udt_format == 0x5 && udt_uab == 3)
       udt_uab = 2; //set to two if long unspecified format
 
     //Note: NMEA Reserved value UAB 3 is not referenced in ETSI, so unknown number of
diff --git a/src/dmr_csbk.c b/src/dmr_csbk.c
index 6a0e70c..f3a56f5 100644
--- a/src/dmr_csbk.c
+++ b/src/dmr_csbk.c
@@ -700,8 +700,8 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8
           uint8_t ann_res = (uint8_t)ConvertBitIntoBytes(&bpbits1[0], 4);
           uint8_t cc_ch1 = (uint8_t)ConvertBitIntoBytes(&bpbits1[4], 4);
           uint8_t cc_ch2 = (uint8_t)ConvertBitIntoBytes(&bpbits1[8], 4);
-          uint8_t ch1_flag = bpbits1[13];
-          uint8_t ch2_flag = bpbits1[14];
+          uint8_t ch1_flag = bpbits1[12];
+          uint8_t ch2_flag = bpbits1[13];
 
           uint16_t bcast_ch1 = (uint16_t)ConvertBitIntoBytes(&bpbits2[0], 12);
           uint16_t bcast_ch2 = (uint16_t)ConvertBitIntoBytes(&bpbits2[12], 12);
diff --git a/src/dmr_pi.c b/src/dmr_pi.c
index 84ba10e..257d0ce 100644
--- a/src/dmr_pi.c
+++ b/src/dmr_pi.c
@@ -16,7 +16,7 @@ void dmr_pi (dsd_opts * opts, dsd_state * state, uint8_t PI_BYTE[], uint32_t CRC
 
   uint8_t MFID = PI_BYTE[1];
 
-  if((IrrecoverableErrors == 0))
+  if(IrrecoverableErrors == 0)
   {
 
     //update cc amd vc sync time for trunking purposes (particularly Con+)
diff --git a/src/dsd_alias.c b/src/dsd_alias.c
index 6bc10aa..82d42ea 100644
--- a/src/dsd_alias.c
+++ b/src/dsd_alias.c
@@ -368,7 +368,9 @@ void apx_embedded_alias_decode (dsd_opts * opts, dsd_state * state, uint8_t slot
       uint8_t shortstop = accum_mult | 0x1;
       uint8_t increment = shortstop << 1;
 
-      while(mult2 != -1 && shortstop != 1)
+      //clang warning -- warning: result of comparison of constant -1 with expression of type 'uint8_t' (aka 'unsigned char') is always true [-Wtautological-constant-out-of-range-compare]
+      // while(mult2 != -1 && shortstop != 1) //clang warning can't be -1 if uint8_t (set to 255 instead?)
+      while(shortstop != 1) //this one tests out okay, so may use it instead
       {
         shortstop += increment;
         mult2 += 2;
diff --git a/src/dsd_gps.c b/src/dsd_gps.c
index 9ece08b..6e72f6d 100644
--- a/src/dsd_gps.c
+++ b/src/dsd_gps.c
@@ -95,7 +95,7 @@ void lip_protocol_decoder (dsd_opts * opts, dsd_state * state, uint8_t * input)
   int dt = (int)dir;
 
   //sanity check
-  if (abs (latitude) < 90 && abs(longitude) < 180)
+  if (fabs (latitude) < 90 && fabs(longitude) < 180)
   {
     fprintf (stderr, "Src(Hash); %03d;  Lat: %.5lf%s%s Lon: %.5lf%s%s (%.5lf, %.5lf); Spd: %d km/h; Dir: %d%s",add_hash, latitude, deg_glyph, latstr, longitude, deg_glyph, lonstr, lat_sf * latitude, lon_sf * longitude, vt, dt, deg_glyph);
 
@@ -627,7 +627,7 @@ void dmr_embedded_gps (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[])
     longitude = ((double)lon * lon_unit);
 
     //sanity check
-    if (abs (latitude) < 90 && abs(longitude) < 180)
+    if (fabs(latitude) < 90 && fabs(longitude) < 180)
     {
       fprintf (stderr, " Lat: %.5lf%s%s Lon: %.5lf%s%s (%.5lf, %.5lf)", latitude, deg_glyph, latstr, longitude, deg_glyph, lonstr, lat_sf * latitude, lon_sf * longitude);
 
diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c
index 31057a8..1ba245c 100644
--- a/src/dsd_ncurses.c
+++ b/src/dsd_ncurses.c
@@ -154,7 +154,7 @@ void beeper (dsd_opts * opts, dsd_state * state, int lr, int id, int ad, int len
   for (j = 0; j < len; j++)
   {
     //'zero' out stereo mix samples
-    memset (samp_fs, 0.1f, sizeof(samp_fs));
+    memset (samp_fs, 0, sizeof(samp_fs));
     memset (samp_ss, 0, sizeof(samp_ss));
 
     //generate a tone with supplied tone ID and AD value
diff --git a/src/dsd_symbol.c b/src/dsd_symbol.c
index 9d1b8b9..64744e4 100644
--- a/src/dsd_symbol.c
+++ b/src/dsd_symbol.c
@@ -639,13 +639,6 @@ getSymbol (dsd_opts * opts, dsd_state * state, int have_sync)
 
     state->symbolc = fgetc(opts->symbolfile);
 
-    //experimental throttle
-    if (state->use_throttle == 1)
-    {
-      // useconds_t stime = state->symbol_throttle;
-      // usleep(stime);
-      usleep(.003); //very environment specific, tuning to cygwin
-    }
     //fprintf(stderr, "%d", state->symbolc);
     if( feof(opts->symbolfile) )
     {