diff --git a/lib_enc/cod_tcx.c b/lib_enc/cod_tcx.c
index aaa7e4e2e13f01ee0207daa1bad4b3d412ba7824..8ddfb573b7a362c5ad690531591a4340647c1676 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, pTnsParameters[0]->minEnergyChange ) )
+                                    IF( GE_16( maxEnergyChange_fx, L_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, pTnsParameters->minEnergyChange ) )
+                            IF( GE_16( maxEnergyChange_fx, L_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/lp_exc_e_fx.c b/lib_enc/lp_exc_e_fx.c
index 5afca51365058fb72e26d4760309fa7a683b8f78..0887698f78c49dc6579835076bfe83d5af9a5aac 100644
--- a/lib_enc/lp_exc_e_fx.c
+++ b/lib_enc/lp_exc_e_fx.c
@@ -260,7 +260,7 @@ Word16 lp_filt_exc_enc_ivas_fx(
         }
         IF( use_prev_sf_pit_gain == 1 )
         {
-            wtmp1 = adpt_enr_fx( codec_mode, exc_tmp, h1, y1_tmp, L_subfr, &gain2, gain_pit, clip_gain, xn, xn2_tmp, &exp_ener1, use_prev_sf_pit_gain );
+            wtmp1 = adpt_enr_fx( codec_mode, exc_tmp, h1, y1_tmp, L_subfr, gain_pit, g_corr2, clip_gain, xn, xn2_tmp, &exp_ener1, use_prev_sf_pit_gain );
         }
         ELSE
         {
diff --git a/lib_enc/swb_tbe_enc_fx.c b/lib_enc/swb_tbe_enc_fx.c
index 23bd387d4db846e742a72044d90b9983c7131d32..f67d81c7132e58062b7ee282a686c76fbb31fd7a 100644
--- a/lib_enc/swb_tbe_enc_fx.c
+++ b/lib_enc/swb_tbe_enc_fx.c
@@ -4049,7 +4049,9 @@ void swb_tbe_enc_ivas_fx(
     {
         /* Re-normalize gain shape before quantization */
         // sum_gain = sum2_f(GainShape, NUM_SHB_SUBGAINS);
-        sum_gain_fx = sum16_32_fx( GainShape_fx, NUM_SHB_SUBGAINS );
+        tmp = 0;
+        move16();
+        sum_gain_fx = sum2_16_exp_fx( GainShape_fx, NUM_SHB_SUBGAINS, &tmp, 2 );
         IF( sum_gain_fx == 0 )
         {
             normFact_fx = 0;
@@ -4058,8 +4060,6 @@ void swb_tbe_enc_ivas_fx(
         ELSE
         {
             // normFact = (float) sqrt( 1.0f / sum_gain );
-            tmp = Q16;
-            move16();
             normFact_fx = ISqrt32( sum_gain_fx, &tmp );
         }
 
diff --git a/lib_enc/tns_base_enc_fx.c b/lib_enc/tns_base_enc_fx.c
index 79bb7b914d1f7b7ad5627ee359f8aaeaff37d3ce..90028b7321c7ae610bdb4df168632307627b6c44 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, pTnsParameters->minEnergyChange ) >= 0 )
+                IF( sub( maxEnergyChange, L_shl( pTnsParameters->minEnergyChange, Q3 - Q7 ) ) >= 0 )
                 {
 
                     pTnsData->nFilters = add( pTnsData->nFilters, 1 );