diff --git a/lib_dec/ivas_init_dec.c b/lib_dec/ivas_init_dec.c
index 6715d956c2b34ad1d4278fe182e6d2e3b5476de5..134c89dc9bd67734f1be190ba3c6679cd72d5850 100644
--- a/lib_dec/ivas_init_dec.c
+++ b/lib_dec/ivas_init_dec.c
@@ -1835,7 +1835,7 @@ ivas_error ivas_init_decoder(
             }
         }
 
-#ifdef IVAS_FLOAT_FIXED_TEST
+#ifdef IVAS_FLOAT_FIXED
         IF( ( error = ivas_create_lfe_dec_fx( &st_ivas->hLFE, output_Fs, binauralization_delay_ns ) ) != IVAS_ERR_OK )
 #else
         IF( ( error = ivas_create_lfe_dec( &st_ivas->hLFE, output_Fs, binauralization_delay_ns ) ) != IVAS_ERR_OK )
@@ -2305,7 +2305,7 @@ void ivas_destroy_dec(
     ivas_mct_dec_close( &st_ivas->hMCT );
 
     /* LFE handle */
-#ifdef IVAS_FLOAT_FIXED_TEST
+#ifdef IVAS_FLOAT_FIXED
     ivas_lfe_dec_close_fx( &( st_ivas->hLFE ) );
 #else
     ivas_lfe_dec_close( &( st_ivas->hLFE ) );
diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec.c
index 9e2080f9082fa997a8a22d195c616afdabd04ad1..63f585fed998608e8802ae0b9a573ccaf2882198 100644
--- a/lib_dec/ivas_jbm_dec.c
+++ b/lib_dec/ivas_jbm_dec.c
@@ -601,7 +601,7 @@ ivas_error ivas_jbm_dec_tc(
         if ( st_ivas->mc_mode == MC_MODE_MCT )
         {
             /* LFE channel decoder */
-#ifdef IVAS_FLOAT_FIXED_TEST
+#ifdef IVAS_FLOAT_FIXED
             Word32 *p_output_fx;
 
             p_output_fx = (Word32 *) malloc( ( 48000 / FRAMES_PER_SEC ) * sizeof( Word32 ) );
@@ -654,7 +654,7 @@ ivas_error ivas_jbm_dec_tc(
         else if ( st_ivas->mc_mode == MC_MODE_PARAMUPMIX )
         {
             /* LFE channel decoder */
-#ifdef IVAS_FLOAT_FIXED_TEST
+#ifdef IVAS_FLOAT_FIXED
             Word32 *p_output_fx;
 
             p_output_fx = (Word32 *) malloc( ( 48000 / FRAMES_PER_SEC ) * sizeof( Word32 ) );
diff --git a/lib_dec/ivas_lfe_dec_fx.c b/lib_dec/ivas_lfe_dec_fx.c
index 694c68d98b4483ff3c44d39350935ce4b22e2df7..a6b93e7b74c4de4fccaad955d904437472524c80 100644
--- a/lib_dec/ivas_lfe_dec_fx.c
+++ b/lib_dec/ivas_lfe_dec_fx.c
@@ -129,14 +129,14 @@ static void ivas_lfe_dec_windowing_fx(
         pInbuf[i] = Mpy_32_32( pInbuf[add( zero_pad_len, i )], pWindow_coeffs[i] );
     }
 
-    FOR( i = 0; i < shl( zero_pad_len, 2 ); i++ )
+    FOR( i = 0; i < shl( zero_pad_len, 1 ); i++ )
     {
         pInbuf[add( fade_len, i )] = pInbuf[add( add( zero_pad_len, fade_len ), i )];
     }
 
     FOR( i = 0; i < fade_len; i++ )
     {
-        pInbuf[add( add( shl( zero_pad_len, 2 ), fade_len ), i )] = Mpy_32_32( pInbuf[add( add( i_mult( zero_pad_len, 3 ), fade_len ), i )], pWindow_coeffs[sub( sub( fade_len, i ), 1 )] );
+        pInbuf[add( add( shl( zero_pad_len, 1 ), fade_len ), i )] = Mpy_32_32( pInbuf[add( add( i_mult( zero_pad_len, 3 ), fade_len ), i )], pWindow_coeffs[sub( sub( fade_len, i ), 1 )] );
     }
 
     return;
diff --git a/lib_dec/ivas_mct_dec.c b/lib_dec/ivas_mct_dec.c
index 0c819eaad9238a409b0948c700a70dcd61689f1a..64344b712bacf2c5925d6637c9f6e51b3a9b9468 100644
--- a/lib_dec/ivas_mct_dec.c
+++ b/lib_dec/ivas_mct_dec.c
@@ -1017,7 +1017,7 @@ static ivas_error ivas_mc_dec_reconfig(
         }
 
         /* LFE handle */
-#ifdef IVAS_FLOAT_FIXED_TEST
+#ifdef IVAS_FLOAT_FIXED
         ivas_lfe_dec_close_fx( &( st_ivas->hLFE ) );
 #else
         ivas_lfe_dec_close( &( st_ivas->hLFE ) );
@@ -1060,7 +1060,7 @@ static ivas_error ivas_mc_dec_reconfig(
         }
 
         /* LFE handle */
-#ifdef IVAS_FLOAT_FIXED_TEST
+#ifdef IVAS_FLOAT_FIXED
         ivas_lfe_dec_close_fx( &( st_ivas->hLFE ) );
 #else
         ivas_lfe_dec_close( &( st_ivas->hLFE ) );
@@ -1204,8 +1204,8 @@ static ivas_error ivas_mc_dec_reconfig(
             }
         }
 
-#ifdef IVAS_FLOAT_FIXED_TEST
-        if ( ( error = ivas_create_lfe_dec_fx( &st_ivas->hLFE, st_ivas->hDecoderConfig->output_Fs, binauralization_delay_ns ) ) != IVAS_ERR_OK )
+#ifdef IVAS_FLOAT_FIXED
+        IF ( ( error = ivas_create_lfe_dec_fx( &st_ivas->hLFE, st_ivas->hDecoderConfig->output_Fs, binauralization_delay_ns ) ) != IVAS_ERR_OK )
 #else
         if ( ( error = ivas_create_lfe_dec( &st_ivas->hLFE, st_ivas->hDecoderConfig->output_Fs, binauralization_delay_ns ) ) != IVAS_ERR_OK )
 #endif // IVAS_FLOAT_FIXED