diff --git a/lib_xua/src/core/clocking/clockgen.xc b/lib_xua/src/core/clocking/clockgen.xc
index eb294057..f2dcecf9 100644
--- a/lib_xua/src/core/clocking/clockgen.xc
+++ b/lib_xua/src/core/clocking/clockgen.xc
@@ -665,7 +665,7 @@ void clockGen (streaming chanend ?c_spdif_rx, chanend ?c_adat_rx, out port p, ch
                                     /* Inspect for if we need to produce an edge */
                                     if ((adatCounters.receivedSamples >= adatCounters.samplesPerTick))
                                     {
-                                        /* Check edge is about right... S/PDIF may have changed freq... */
+                                        /* Check edge is about right... ADAT may have changed freq... */
                                         if (timeafter(adatReceivedTime, (timeLastEdge + LOCAL_CLOCK_INCREMENT - LOCAL_CLOCK_MARGIN)))
                                         {
                                             /* Record edge time */
diff --git a/lib_xua/src/core/mixer/mixer.xc b/lib_xua/src/core/mixer/mixer.xc
index d14504aa..66123804 100644
--- a/lib_xua/src/core/mixer/mixer.xc
+++ b/lib_xua/src/core/mixer/mixer.xc
@@ -255,50 +255,48 @@ static inline void GiveSamplesToDevice(chanend c, xc_ptr ptr, xc_ptr multOut)
 #if(NUM_USB_CHAN_OUT == 0)
     outuint(c, 0);
 #else
-    {
 #pragma loop unroll
-        for (int i=0; i<NUM_USB_CHAN_OUT; i++)
-        {
-            int sample, x;
+    for (int i=0; i<NUM_USB_CHAN_OUT; i++)
+    {
+        int sample, x;
 #if defined(OUT_VOLUME_IN_MIXER) && defined(OUT_VOLUME_AFTER_MIX)
-            int mult;
-            int h;
-            unsigned l;
+        int mult;
+        int h;
+        unsigned l;
 #endif
-            int index;
+        int index;
 
 #if MAX_MIX_COUNT > 0
-            /* If mixer turned on sort out the channel mapping */
+        /* If mixer turned on sort out the channel mapping */
 
-            /* Read pointer to sample from the map */
-            read_via_xc_ptr_indexed(index, ptr, i);
+        /* Read pointer to sample from the map */
+        read_via_xc_ptr_indexed(index, ptr, i);
 
-            /* Read the actual sample value */
-            read_via_xc_ptr_indexed(sample, samples, index);
+        /* Read the actual sample value */
+        read_via_xc_ptr_indexed(sample, samples, index);
 #else
-            unsafe
-            {
-                /* Read the actual sample value */
-                sample = ptr_samples[i];
-            }
+        unsafe
+        {
+            /* Read the actual sample value */
+            sample = ptr_samples[i];
+        }
 #endif
 
 #if defined(OUT_VOLUME_IN_MIXER) && defined(OUT_VOLUME_AFTER_MIX)
-            /* Do volume control processing */
+        /* Do volume control processing */
 #warning OUT Vols in mixer, AFTER mix & map
-            read_via_xc_ptr_indexed(mult, multOut, i);
-            {h, l} = macs(mult, sample, 0, 0);
-            h<<=3;              // Shift used to be done in audio thread but now done here incase of 32bit support
+        read_via_xc_ptr_indexed(mult, multOut, i);
+        {h, l} = macs(mult, sample, 0, 0);
+        h<<=3;              // Shift used to be done in audio thread but now done here incase of 32bit support
 #error
 #if (STREAM_FORMAT_OUTPUT_RESOLUTION_32BIT_USED == 1)
-            h |= (l >>29)& 0x7; // Note: This step is not required if we assume sample depth is 24bit (rather than 32bit)
-                            // Note: We need all 32bits for Native DSD
+        h |= (l >>29)& 0x7; // Note: This step is not required if we assume sample depth is 24bit (rather than 32bit)
+                        // Note: We need all 32bits for Native DSD
 #endif
-            outuint(c, h);
+        outuint(c, h);
 #else
-            outuint(c, sample);
+        outuint(c, sample);
 #endif
-        }
     }
 #endif
 }