diff --git a/lib_xua/api/xua_conf_default.h b/lib_xua/api/xua_conf_default.h
index 9e6ed31b..b501b982 100644
--- a/lib_xua/api/xua_conf_default.h
+++ b/lib_xua/api/xua_conf_default.h
@@ -1093,7 +1093,7 @@
 #endif
 
 /* Handle in volume control in the mixer - disabled by default */
-#ifdef IN_VOLUME_IN_MIXER 
+#ifndef IN_VOLUME_IN_MIXER 
 #define IN_VOLUME_IN_MIXER          (0)
 #endif
 
diff --git a/lib_xua/src/core/endpoint0/xua_ep0_uacreqs.xc b/lib_xua/src/core/endpoint0/xua_ep0_uacreqs.xc
index a7ae87ec..c065daf3 100644
--- a/lib_xua/src/core/endpoint0/xua_ep0_uacreqs.xc
+++ b/lib_xua/src/core/endpoint0/xua_ep0_uacreqs.xc
@@ -768,7 +768,7 @@ int AudioClassRequests_2(XUD_ep ep0_out, XUD_ep ep0_in, USB_SetupPacket_t &sp, c
                                     else
                                     {
                                         /* Update relevant mix map */
-                                        mixSel[cn-1][cn] = source;
+                                        mixSel[cs-1][cn] = source;
                                         UpdateMixMap(c_mix_ctl, cs-1, cn, mixSel[cs-1][cn]);
                                     }
 
diff --git a/lib_xua/src/core/mixer/mixer.xc b/lib_xua/src/core/mixer/mixer.xc
index 5a4176eb..088e8b13 100644
--- a/lib_xua/src/core/mixer/mixer.xc
+++ b/lib_xua/src/core/mixer/mixer.xc
@@ -125,15 +125,12 @@ int doMix5(volatile int * const unsafe samples, volatile int * const unsafe mult
 int doMix6(volatile int * const unsafe samples, volatile int * const unsafe mult);
 int doMix7(volatile int * const unsafe samples, volatile int * const unsafe mult);
 #else
-/* DO NOT inline, causes 10.4.2 tools to add extra loads in loop */
-/* At 18 x 12dB we could get 64 x bigger */
 #pragma unsafe arrays
 static inline int doMix(volatile int * unsafe samples, volatile int * unsafe const mixMap, volatile int * const unsafe mult)
 {
     int h=0;
     int l=0;
 
-/* By breaking up the loop we keep things in the encoding for ldw (0-11) */
 #pragma loop unroll
     for (int i=0; i<MIX_INPUTS; i++)
     unsafe{