diff --git a/lib_com/ivas_entropy_coder_common.c b/lib_com/ivas_entropy_coder_common.c
index 3b4b0142dcb9c8d1431c0aa3230797ad74c8fb6e..a2fa26cad9f53c6a8f50eaf139331277e3f95f8a 100644
--- a/lib_com/ivas_entropy_coder_common.c
+++ b/lib_com/ivas_entropy_coder_common.c
@@ -127,7 +127,7 @@ int16_t ivas_map_num_pred_r_to_idx(
                 pred_r_to_idx = PRED_Q_31;
                 break;
             default:
-                assert( "Forbidden value for prediction quantization strategy index" );
+                assert( !"Forbidden value for prediction quantization strategy index" );
                 break;
         }
     }
@@ -145,7 +145,7 @@ int16_t ivas_map_num_pred_r_to_idx(
                 pred_r_to_idx = PRED_Q_21_ACTIVE_W;
                 break;
             default:
-                assert( "Forbidden value for prediction quantization strategy index" );
+                assert( !"Forbidden value for prediction quantization strategy index" );
                 break;
         }
     }
@@ -179,7 +179,7 @@ int16_t ivas_map_num_drct_r_to_idx(
             drct_r_to_idx = DRCT_Q_11;
             break;
         default:
-            assert( "Forbidden value for DRCT quantization strategy index" );
+            assert( !"Forbidden value for DRCT quantization strategy index" );
             break;
     }
     return drct_r_to_idx;
@@ -217,7 +217,7 @@ int16_t ivas_map_num_decd_r_to_idx(
             decd_r_to_idx = DECD_Q_11;
             break;
         default:
-            assert( "Forbidden value for DECD quantization strategy index" );
+            assert( !"Forbidden value for DECD quantization strategy index" );
             break;
     }
 
diff --git a/lib_dec/ivas_cpe_dec.c b/lib_dec/ivas_cpe_dec.c
index e96df0d637b21ca1de335f286bbbb616fec1be4b..ddd4ae363feef98107508958914daa32ca85362b 100644
--- a/lib_dec/ivas_cpe_dec.c
+++ b/lib_dec/ivas_cpe_dec.c
@@ -963,7 +963,7 @@ static void read_stereo_mode_and_bwidth(
                 hCPE->element_mode = IVAS_CPE_MDCT;
                 break;
             case SID_SBA_1TC:
-                assert( "Forbidden value for SID format in CPE (SBA 1TC), should have already been adressed earlier" );
+                assert( !"Forbidden value for SID format in CPE (SBA 1TC), should have already been adressed earlier" );
                 break;
             case SID_MASA_1TC:
                 hCPE->element_mode = IVAS_SCE;
diff --git a/lib_enc/ivas_mct_enc.c b/lib_enc/ivas_mct_enc.c
index 5e6511fce6d2555b6feb4e1482d3a230ae44f29f..eb7975c1c1110daeb8d8699d8375fd135d4bb661 100644
--- a/lib_enc/ivas_mct_enc.c
+++ b/lib_enc/ivas_mct_enc.c
@@ -130,7 +130,7 @@ ivas_error ivas_mct_enc(
 #ifdef DEBUG_FORCE_MCT_CP
     if ( ivas_format == MC_FORMAT )
     {
-        assert( "Debugging switch works only with SBA modes" );
+        assert( !"Debugging switch works only with SBA modes" );
     }
 #endif
 
diff --git a/lib_enc/ivas_sba_enc.c b/lib_enc/ivas_sba_enc.c
index cabd6fdddefc5030993a33ff634571918f71d090..2af2cf76fa2ff72c36bd57eafa7f4d4d55966179 100644
--- a/lib_enc/ivas_sba_enc.c
+++ b/lib_enc/ivas_sba_enc.c
@@ -58,7 +58,10 @@ void ivas_sba_getTCs(
     const int16_t input_frame     /* i  : frame length                 */
 )
 {
-    ivas_sba_zero_vert_comp( sba_data, st_ivas->sba_analysis_order, st_ivas->hEncoderConfig->sba_planar, input_frame );
+    if ( st_ivas->hEncoderConfig->sba_planar )
+    {
+        ivas_sba_zero_vert_comp( sba_data, st_ivas->sba_analysis_order, st_ivas->hEncoderConfig->sba_planar, input_frame );
+    }
 
     st_ivas->nchan_transport = ivas_get_sba_num_TCs( st_ivas->hEncoderConfig->ivas_total_brate, st_ivas->sba_analysis_order );
 
diff --git a/lib_enc/ivas_spar_encoder.c b/lib_enc/ivas_spar_encoder.c
index b13ad3077fba06be831f597cc667c316c10211c6..f1e87a59baacf8fae4fbec4fc0db34a6fd251a93 100644
--- a/lib_enc/ivas_spar_encoder.c
+++ b/lib_enc/ivas_spar_encoder.c
@@ -343,11 +343,6 @@ ivas_error ivas_spar_enc(
         return error;
     }
 
-    if ( hEncoderConfig->sba_planar )
-    {
-        ivas_sba_zero_vert_comp( data_f, st_ivas->sba_analysis_order, hEncoderConfig->sba_planar, input_frame ); // TODO tmu: do we need a second call to this function ?
-    }
-
     *nb_bits_metadata = hMetaData->nb_bits_tot;
 
     /* Force IVAS front pre-proc decision for higher bitrates */