diff --git a/lib_com/ivas_cnst.h b/lib_com/ivas_cnst.h
index 02250e0f7fab236b985a578973187f93c79fafeb..3d9cf4e7a14062cbe73f3dde715f6186253d1fd1 100644
--- a/lib_com/ivas_cnst.h
+++ b/lib_com/ivas_cnst.h
@@ -165,11 +165,13 @@ typedef enum
 #define HEAD_ROTATION_HOA_ORDER                 3                           /* HOA 3rd order */
 #define MAX_CICP_CHANNELS                       16                          /* max channels for loudspeaker layouts (16 for custom layouts)*/
 #define MAX_OUTPUT_CHANNELS                     16                          /* Maximum number of output channels (HOA 3rd order) */
-
-#define FOA_CHANNELS                            4                           /* number of FOA channels */
+#ifndef FIX_DIRAC_CHANNELS
+#define IVAS_MAX_NUM_CH                         16                          /* == MAX_OUTPUT_CHANNELS */
+#endif
 
 #define BINAURAL_CHANNELS                       2                           /* number of channels for binaural output configuration */
 #define CPE_CHANNELS                            2                           /* number of CPE (stereo) channels */
+#define FOA_CHANNELS                            4                           /* number of FOA channels */
 #define MAX_NUM_OBJECTS                         4                           /* max. number of audio objects */
 
 #define MAX_SCE                                 MAX_NUM_OBJECTS             /* max. number of SCEs */
diff --git a/lib_com/ivas_prot.h b/lib_com/ivas_prot.h
index a7f5987e38cda57caaaeb7bb3ab5af01fb96371f..15bee015533e889f56323f8af835a51cf1922aaf 100644
--- a/lib_com/ivas_prot.h
+++ b/lib_com/ivas_prot.h
@@ -3034,7 +3034,7 @@ void ivas_sba_config(
     int16_t *nCPE,                                              /* o  : number of CPEs                          */
     int16_t *element_mode                                       /* o  : element mode of the core coder          */
 #ifndef HARMONIZE_SBA_NCHAN_TRANSPORT
-    const SBA_MODE sba_mode                                     /* i  : SBA mode                                */
+   ,const SBA_MODE sba_mode                                     /* i  : SBA mode                                */
 #endif
 );