diff --git a/lib_dec/ivas_svd_dec.c b/lib_dec/ivas_svd_dec.c
index c8778f99ccf301a493996b9489d1139c3a6074f9..77cf192c27a8fe3711b310e79523641be58fe99f 100644
--- a/lib_dec/ivas_svd_dec.c
+++ b/lib_dec/ivas_svd_dec.c
@@ -1971,11 +1971,11 @@ static Word32 maxWithSign_fx(
     }
 #else
     Word32 result;
-    if ( a >= 0 )
+    IF( a >= 0 )
     {
         result = L_max( a, SVD_MINIMUM_VALUE_FX );
     }
-    if ( a < 0 )
+    ELSE
     {
         result = L_min( a, -SVD_MINIMUM_VALUE_FX );
     }
diff --git a/lib_enc/cod_tcx.c b/lib_enc/cod_tcx.c
index 8ddfb573b7a362c5ad690531591a4340647c1676..963cc16506ba70549c08e644f989d7c1d85d9421 100644
--- a/lib_enc/cod_tcx.c
+++ b/lib_enc/cod_tcx.c
@@ -290,7 +290,7 @@ void TNSAnalysisStereo_fx(
                                     Word16 maxEnergyChange_fx;
                                     maxEnergyChange_fx = mac_r( L_mult( GetTCXMaxenergyChange_ivas_fx( sts[0]->hTranDet, isTCX10, NSUBBLOCKS, 3 ), 16384 ), GetTCXMaxenergyChange_ivas_fx( sts[1]->hTranDet, isTCX10, NSUBBLOCKS, 3 ), 16384 );
 
-                                    IF( GE_16( maxEnergyChange_fx, L_shl( pTnsParameters[0]->minEnergyChange, Q3 - Q7 ) ) )
+                                    IF( GE_16( maxEnergyChange_fx, shl( pTnsParameters[0]->minEnergyChange, Q3 - Q7 ) ) )
                                     {
                                         sts[0]->hTcxEnc->tnsData[k].nFilters = add( sts[0]->hTcxEnc->tnsData[k].nFilters, 1 );
                                         move16();
@@ -552,7 +552,7 @@ void TNSAnalysisStereo_fx(
                         {
                             Word16 maxEnergyChange_fx = GetTCXMaxenergyChange_ivas_fx( sts[ch]->hTranDet, isTCX10, NSUBBLOCKS, 3 );
 
-                            IF( GE_16( maxEnergyChange_fx, L_shl( pTnsParameters->minEnergyChange, Q3 - Q7 ) ) )
+                            IF( GE_16( maxEnergyChange_fx, shl( pTnsParameters->minEnergyChange, Q3 - Q7 ) ) )
                             {
                                 sts[ch]->hTcxEnc->tnsData[k].nFilters = add( sts[ch]->hTcxEnc->tnsData[k].nFilters, 1 );
                                 move16();
diff --git a/lib_enc/tns_base_enc_fx.c b/lib_enc/tns_base_enc_fx.c
index 90028b7321c7ae610bdb4df168632307627b6c44..d1763e039fc96f6e36d1e442fb510c57d1b16332 100644
--- a/lib_enc/tns_base_enc_fx.c
+++ b/lib_enc/tns_base_enc_fx.c
@@ -675,7 +675,7 @@ Word16 DetectTnsFilt_ivas_fx( STnsConfig const *pTnsConfig, /* i  : TNS Configur
             ELSE
             {
                 maxEnergyChange = GetTCXMaxenergyChange_ivas_fx( hTranDet, isTCX10, NSUBBLOCKS, 3 );
-                IF( sub( maxEnergyChange, L_shl( pTnsParameters->minEnergyChange, Q3 - Q7 ) ) >= 0 )
+                IF( sub( maxEnergyChange, shl( pTnsParameters->minEnergyChange, Q3 - Q7 ) ) >= 0 )
                 {
 
                     pTnsData->nFilters = add( pTnsData->nFilters, 1 );