diff --git a/lib_dec/ivas_dirac_dec_fx.c b/lib_dec/ivas_dirac_dec_fx.c
index 10b8059b9d5e81d92895fa2cff267488d71a586b..9c319489e5e54c3ae37d0a7abe33d6649de513be 100644
--- a/lib_dec/ivas_dirac_dec_fx.c
+++ b/lib_dec/ivas_dirac_dec_fx.c
@@ -2186,7 +2186,7 @@ void ivas_dirac_dec_render_sf_fx(
     move16();
 
 
-    FOR( Word16 i = 0; i < MAX_OUTPUT_CHANNELS; i++ )
+    FOR( i = 0; i < MAX_OUTPUT_CHANNELS; i++ )
     {
         FOR( Word16 j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ )
         {
@@ -2195,7 +2195,7 @@ void ivas_dirac_dec_render_sf_fx(
         }
     }
 
-    FOR( Word16 i = 0; i < BINAURAL_CHANNELS; i++ )
+    FOR( i = 0; i < BINAURAL_CHANNELS; i++ )
     {
         FOR( Word16 j = 0; j < MAX_PARAM_SPATIAL_SUBFRAMES; j++ )
         {
diff --git a/lib_enc/ext_sig_ana_fx.c b/lib_enc/ext_sig_ana_fx.c
index 200e7e8edc410168b73ffd26a52f84ac35c5bfe4..eeeb294b43d27f31ba81ee9e8dfed11486645184 100644
--- a/lib_enc/ext_sig_ana_fx.c
+++ b/lib_enc/ext_sig_ana_fx.c
@@ -1401,7 +1401,7 @@ void core_signal_analysis_high_bitrate_ivas_fx(
             IF( st->igf )
             {
                 Word16 q_spectrum = sub( Q31, hTcxEnc->spectrum_e[frameno] );
-                ProcessIGF_ivas_fx( st, N_MAX + L_MDCT_OVLP_MAX, hTcxEnc->spectrum_fx[frameno], hTcxEnc->spectrum_fx[frameno], &q_spectrum, powerSpec, powerSpec_e, transform_type[frameno] == TCX_20, frameno, 0, vad_hover_flag );
+                ProcessIGF_ivas_fx( st, N_MAX + L_MDCT_OVLP_MAX, hTcxEnc->spectrum_fx[frameno], &q_spectrum, hTcxEnc->spectrum_fx[frameno], q_spectrum, powerSpec, powerSpec_e, transform_type[frameno] == TCX_20, frameno, 0, vad_hover_flag );
             }
         }
     }
diff --git a/lib_enc/ivas_mct_core_enc_fx.c b/lib_enc/ivas_mct_core_enc_fx.c
index 548a5671741574d9d44a77d61906e8c9e8c8e2e9..0ab232dd9552d462eb7cc75fc22638baeea4f871 100644
--- a/lib_enc/ivas_mct_core_enc_fx.c
+++ b/lib_enc/ivas_mct_core_enc_fx.c
@@ -646,7 +646,7 @@ void ivas_mct_core_enc_fx(
                         q_spectrum = sub( 31, st->hTcxEnc->spectrum_e[n] );
                         set16_fx( exp_powerSpec[ch], sub( Q31, q_powSpec[ch] ), N_MAX + L_MDCT_OVLP_MAX );
 
-                        ProcessIGF_ivas_fx( st, L_FRAME48k, st->hTcxEnc->spectrum_fx[n], orig_spectrum_fx[ch][n], &q_spectrum, &powerSpec_fx[ch][n * L_subframeTCX], &exp_powerSpec[ch][n * L_subframeTCX], st->core == TCX_20_CORE, n, sp_aud_decision0[ch], 0 );
+                        ProcessIGF_ivas_fx( st, L_FRAME48k, st->hTcxEnc->spectrum_fx[n], &q_spectrum, orig_spectrum_fx[ch][n], q_origSpec, &powerSpec_fx[ch][n * L_subframeTCX], &exp_powerSpec[ch][n * L_subframeTCX], st->core == TCX_20_CORE, n, sp_aud_decision0[ch], 0 );
 
                         st->hIGFEnc->spec_be_igf_e = sub( 31, q_origSpec );
                         st->hTcxEnc->spectrum_e[n] = sub( 31, q_spectrum );
diff --git a/lib_enc/ivas_mct_enc_mct_fx.c b/lib_enc/ivas_mct_enc_mct_fx.c
index aed6aefa4c2e1c4d6bce4e62c0923a448bd0a2b4..67f3b3d47477203e825268735504160d25c1270d 100644
--- a/lib_enc/ivas_mct_enc_mct_fx.c
+++ b/lib_enc/ivas_mct_enc_mct_fx.c
@@ -1122,7 +1122,7 @@ void mctStereoIGF_enc_fx(
                     q_spectrum = sub( 31, st->hTcxEnc->spectrum_e[n] );
 
                     set16_fx( exp_powerSpec[p_ch[ch]], sub( Q31, q_powerSpec[p_ch[ch]] ), N_MAX + L_MDCT_OVLP_MAX );
-                    ProcessIGF_ivas_fx( st, L_FRAME48k, st->hTcxEnc->spectrum_fx[n], orig_spectrum_fx[p_ch[ch]][n], &q_spectrum, &powerSpec_fx[p_ch[ch]][n * L_subframeTCX], &exp_powerSpec[p_ch[ch]][n * L_subframeTCX], st->core == TCX_20_CORE, n, sp_aud_decision0[ch], 0 );
+                    ProcessIGF_ivas_fx( st, L_FRAME48k, st->hTcxEnc->spectrum_fx[n], &q_spectrum, orig_spectrum_fx[p_ch[ch]][n], q_origSpec, &powerSpec_fx[p_ch[ch]][n * L_subframeTCX], &exp_powerSpec[p_ch[ch]][n * L_subframeTCX], st->core == TCX_20_CORE, n, sp_aud_decision0[ch], 0 );
 
                     st->hTcxEnc->spectrum_e[n] = sub( 31, q_spectrum );
                     move16();
@@ -1163,7 +1163,7 @@ void mctStereoIGF_enc_fx(
                     q_spectrum = sub( 31, st->hTcxEnc->spectrum_e[n] );
 
                     set16_fx( exp_powerSpec[ch], sub( Q31, q_powerSpec[ch] ), N_MAX + L_MDCT_OVLP_MAX );
-                    ProcessIGF_ivas_fx( st, L_FRAME48k, st->hTcxEnc->spectrum_fx[n], orig_spectrum_fx[ch][n], &q_spectrum, &powerSpec_fx[ch][n * L_subframeTCX], &exp_powerSpec[ch][n * L_subframeTCX], st->core == TCX_20_CORE, n, sp_aud_decision0[ch], 0 );
+                    ProcessIGF_ivas_fx( st, L_FRAME48k, st->hTcxEnc->spectrum_fx[n], &q_spectrum, orig_spectrum_fx[ch][n], q_origSpec, &powerSpec_fx[ch][n * L_subframeTCX], &exp_powerSpec[ch][n * L_subframeTCX], st->core == TCX_20_CORE, n, sp_aud_decision0[ch], 0 );
 
                     st->hTcxEnc->spectrum_e[n] = sub( 31, q_spectrum );
                     move16();
diff --git a/lib_enc/ivas_stereo_mdct_core_enc_fx.c b/lib_enc/ivas_stereo_mdct_core_enc_fx.c
index aa762a77c522ca298eacf8b1d5fe69be56853d31..c38494669c8ae4179c34fa7c61a8c7ea49e8a630 100644
--- a/lib_enc/ivas_stereo_mdct_core_enc_fx.c
+++ b/lib_enc/ivas_stereo_mdct_core_enc_fx.c
@@ -710,7 +710,7 @@ void stereo_mdct_core_enc_fx(
                         q_spectrum = sub( Q31, st->hTcxEnc->spectrum_e[n] );
 
                         Scale_sig32( orig_spectrum_fx[ch][n], st->hIGFEnc->infoStopLine, sub( q_spectrum, sub( Q31, p_orig_spectrum_e[ch] ) ) ); /* q_spectrum */
-                        ProcessIGF_ivas_fx( st, N_MAX, st->hTcxEnc->spectrum_fx[n], orig_spectrum_fx[ch][n], &q_spectrum, &powerSpec_fx[ch][n * L_subframeTCX], &exp_powerSpec[ch][n * L_subframeTCX], st->core == TCX_20_CORE, n, hCPE->hCoreCoder[0]->sp_aud_decision0, 0 );
+                        ProcessIGF_ivas_fx( st, N_MAX, st->hTcxEnc->spectrum_fx[n], &q_spectrum, orig_spectrum_fx[ch][n], q_spectrum, &powerSpec_fx[ch][n * L_subframeTCX], &exp_powerSpec[ch][n * L_subframeTCX], st->core == TCX_20_CORE, n, hCPE->hCoreCoder[0]->sp_aud_decision0, 0 );
                     }
                 }
             }
@@ -787,7 +787,7 @@ void stereo_mdct_core_enc_fx(
 
                         Scale_sig32( orig_spectrum_fx[ch][n], st->hIGFEnc->infoStopLine, sub( q_spectrum, sub( Q31, p_orig_spectrum_e[ch] ) ) ); /* q_spectrum */
 
-                        ProcessIGF_ivas_fx( st, N_MAX, st->hTcxEnc->spectrum_fx[n], orig_spectrum_fx[ch][n], &q_spectrum, &powerSpec_fx[ch][n * L_subframeTCX], &exp_powerSpec[ch][n * L_subframeTCX], st->core == TCX_20_CORE, n, hCPE->hCoreCoder[0]->sp_aud_decision0, 0 );
+                        ProcessIGF_ivas_fx( st, N_MAX, st->hTcxEnc->spectrum_fx[n], &q_spectrum, orig_spectrum_fx[ch][n], q_spectrum, &powerSpec_fx[ch][n * L_subframeTCX], &exp_powerSpec[ch][n * L_subframeTCX], st->core == TCX_20_CORE, n, hCPE->hCoreCoder[0]->sp_aud_decision0, 0 );
                     }
                 }
             }
diff --git a/lib_enc/prot_fx_enc.h b/lib_enc/prot_fx_enc.h
index 73ec00cbda0c7f3d9eb115182960774279079e15..120dd42b517093453d30f84287b99123ded2615c 100644
--- a/lib_enc/prot_fx_enc.h
+++ b/lib_enc/prot_fx_enc.h
@@ -1244,8 +1244,9 @@ void ProcessIGF_ivas_fx(
     Encoder_State *st,              /* i  : Encoder state                                           */
     Word16 powerSpec_len,           /* i  : length of pPowerSpectrum buffer */
     Word32 *pMDCTSpectrum,          /* i  : MDCT spectrum                                           */
-    const Word32 *pITFMDCTSpectrum, /* i  : MDCT spectrum fir ITF                                   */
     Word16 *q_spectrum,             /* i/o: Q of spectrum */
+    const Word32 *pITFMDCTSpectrum, /* i  : MDCT spectrum fir ITF                                   */
+    const Word16 q_ITFMDCTSpectrum, /* i  : Q of MDCT spectrum fir ITF */
     Word32 *pPowerSpectrum,         /* i  : MDCT^2 + MDST^2 spectrum, or estimate                   */
     Word16 *q_powerSpec,            /* i/o: Q of power spectrum */
     const Word16 isTCX20,           /* i  : flag indicating if the input is TCX20 or TCX10/2xTCX5   */
diff --git a/lib_enc/tcx_utils_enc_fx.c b/lib_enc/tcx_utils_enc_fx.c
index 228e522bfb30f18ded6bc1ffd7f4c34ed4fc67c7..7d5f486ccbd3c839725fbe1f115490cfc4c7449b 100644
--- a/lib_enc/tcx_utils_enc_fx.c
+++ b/lib_enc/tcx_utils_enc_fx.c
@@ -3926,8 +3926,9 @@ void ProcessIGF_ivas_fx(
     Encoder_State *st,              /* i  : Encoder state                                           */
     Word16 powerSpec_len,           /* i  : length of pPowerSpectrum buffer */
     Word32 *pMDCTSpectrum,          /* i  : MDCT spectrum (*q_spectrum)                                          */
-    const Word32 *pITFMDCTSpectrum, /* i  : MDCT spectrum fir ITF                                */
     Word16 *q_spectrum,             /* i/o: Q of spectrum */
+    const Word32 *pITFMDCTSpectrum, /* i  : MDCT spectrum fir ITF                                */
+    const Word16 q_ITFMDCTSpectrum, /* i  : Q of MDCT spectrum fir ITF */
     Word32 *pPowerSpectrum,         /* i  : MDCT^2 + MDST^2 spectrum, or estimate (*q_powerSpec)                  */
     Word16 *exp_powerSpec,          /* i/o: Q of power spectrum */
     const Word16 isTCX20,           /* i  : flag indicating if the input is TCX20 or TCX10/2xTCX5   */
@@ -3969,7 +3970,7 @@ void ProcessIGF_ivas_fx(
         }
     }
 
-    IGFSaveSpectrumForITF_ivas_fx( hIGFEnc, igfGridIdx, pITFMDCTSpectrum, sub( Q31, *q_spectrum ) );
+    IGFSaveSpectrumForITF_ivas_fx( hIGFEnc, igfGridIdx, pITFMDCTSpectrum, sub( Q31, q_ITFMDCTSpectrum ) );
 
     IGFEncApplyMono_ivas_fx( st, powerSpec_len, igfGridIdx, pMDCTSpectrum, sub( Q31, *q_spectrum ), pPowerSpectrum, exp_powerSpec, isTCX20, st->hTcxEnc->fUseTns[frameno], sp_aud_decision0, vad_hover_flag );