diff --git a/lib_dec/ivas_mc_param_dec_fx.c b/lib_dec/ivas_mc_param_dec_fx.c
index b6868dbb1486483d2eab66bb5da6fe09aa746725..c25ec972fd15fd62bf8a5b39039c3b284588cd54 100644
--- a/lib_dec/ivas_mc_param_dec_fx.c
+++ b/lib_dec/ivas_mc_param_dec_fx.c
@@ -106,7 +106,7 @@ static ivas_error param_mc_get_diff_proto_info_fx( const Word32 *proto_mtx, cons
 static void param_mc_update_mixing_matrices_fx( PARAM_MC_DEC_HANDLE hParamMC, Word32 *mixing_matrix[], Word16 *mixing_matrix_fx, Word32 *mixing_matrix_res[], Word16 *mixing_matrix_res_exp, const UWord16 nX, const UWord16 nY );
 
 
-static void param_mc_protoSignalComputation_fx( Word32 *RealBuffer_fx, Word32 *ImagBuffer_fx, Word32 *proto_frame_f_fx, const PARAM_MC_DIFF_PROTO_INFO *diff_proto_info, const Word16 num_freq_bands, Word16 Cldfb_Real_Imag_exp, Word16 *proto_frame_f_fx_q /* Word16 ImagBuffer_fx_e, Word16 *common_e*/ );
+static void param_mc_protoSignalComputation_fx( Word32 *RealBuffer_fx, Word32 *ImagBuffer_fx, Word32 *proto_frame_f_fx, const PARAM_MC_DIFF_PROTO_INFO *diff_proto_info, const Word16 num_freq_bands, const Word16 Cldfb_Real_Imag_exp, Word16 *proto_frame_f_fx_q /* Word16 ImagBuffer_fx_e, Word16 *common_e*/ );
 
 /*-------------------------------------------------------------------------
  * ivas_param_mc_dec_open()
diff --git a/lib_dec/ivas_sba_rendering_internal_fx.c b/lib_dec/ivas_sba_rendering_internal_fx.c
index d9ee47c84da1ebdd146d840854374e20867224d7..ba8c529d71c83365484a127b9f30b36a60e37d1e 100644
--- a/lib_dec/ivas_sba_rendering_internal_fx.c
+++ b/lib_dec/ivas_sba_rendering_internal_fx.c
@@ -211,10 +211,10 @@ void ivas_mc2sba_fx(
                 FOR( k = 0; k < output_frame; k++ )
                 {
 #ifdef OPT_BIN_RENDERER_V2
-                    buffer_tmp_fx[j][k] = Madd_32_32( buffer_tmp_fx[j][k], L_shl( in_buffer_td_fx[i][k], 2 ), gains_fx[j] ); /*Q+29-31+2==Q*/
-#else                                                                                                                        /* OPT_BIN_RENDERER_V2 */
+                    buffer_tmp_fx[j][k] = Madd_32_32( buffer_tmp_fx[j][k], L_shl_sat( in_buffer_td_fx[i][k], 2 ), gains_fx[j] ); /*Q+29-31+2==Q*/
+#else                                                                                                                            /* OPT_BIN_RENDERER_V2 */
                     buffer_tmp_fx[j][k] = L_add( buffer_tmp_fx[j][k], L_shl( Mult_32_32( in_buffer_td_fx[i][k], gains_fx[j] ), 2 ) ); /*Q+29-31+2==Q*/
-#endif                                                                                                                       /* OPT_BIN_RENDERER_V2 */
+#endif                                                                                                                           /* OPT_BIN_RENDERER_V2 */
                     move32();
                 }
             }
diff --git a/lib_enc/cod4t64_fast_fx.c b/lib_enc/cod4t64_fast_fx.c
index e24f3b678add290844dd03df2a523248c5a3d169..7079f65971792963c9701841da0e9cc00e80bd54 100644
--- a/lib_enc/cod4t64_fast_fx.c
+++ b/lib_enc/cod4t64_fast_fx.c
@@ -145,7 +145,8 @@ void acelp_fast_fx(
     Word16 track_order[NB_TRACK_FCB_4T * MAX_NUM_INTER], m0_track[NB_TRACK_FCB_4T];
     Word16 ind_stream[NPMAXPT * NB_TRACK_FCB_4T], idx;
     Word16 G, G1, G2, G3, Gn, Gd;
-    Word32 Gd32;
+    Word32 Gd32 = 0;
+    move32();
     Word16 y_tmp[L_SUBFR_MAX];
     Word32 dn[L_SUBFR_MAX];
     Word32 crit_num, crit_den, crit_num_max, crit_den_max, L_tmp1, L_tmp2;
@@ -718,8 +719,6 @@ void acelp_fast_fx(
         IF( GE_16( nb_pulse, 4 ) )
         {
             Gn = add( Gn, i_mult( s[2], dn_orig[m[2]] ) ); // Q_dn
-            Gd32 = Gd;
-            move16();
             temp1 = alp[0];
             move32();
             temp2 = L_mult0( i_mult( shl( s[0], 1 ), s[2] ), alp[m[0] - m[2]] );
@@ -770,8 +769,6 @@ void acelp_fast_fx(
         IF( GE_16( nb_pulse, 5 ) )
         {
             Gn = add( Gn, i_mult( s[3], dn_orig[m[3]] ) ); // Q_dn
-            Gd32 = Gd;
-            move16();
             temp1 = alp[0];
             move32();
             temp2 = L_mult0( i_mult( shl( s[0], 1 ), s[3] ), alp[m[0] - m[3]] );