diff --git a/apps/decoder.c b/apps/decoder.c
index f726ab6d2ae1850be4d04a01518dd20a941dcd89..4e59e521cf00b3ea98fd26f01c665763c04bfd3b 100644
--- a/apps/decoder.c
+++ b/apps/decoder.c
@@ -705,6 +705,7 @@ int main(
         if ( ( error = load_fastconv_HRTF_from_binary( hHrtfFastConv, hrtfReader ) ) != IVAS_ERR_OK )
         {
             fprintf( stderr, "\nError in loading HRTF binary file %s for FastConv \n\n", arg.hrtfCRendFileName );
+            goto cleanup;
         }
         IVAS_DEC_HRTF_PARAMBIN_HANDLE hHrtfParambin = NULL;
         IVAS_DEC_GetHrtfParamBinHandle( hIvasDec, &hHrtfParambin );
@@ -712,6 +713,7 @@ int main(
         if ( ( error = load_parambin_HRTF_from_binary( hHrtfParambin, hrtfReader ) ) != IVAS_ERR_OK )
         {
             fprintf( stderr, "\nError in loading HRTF binary file %s for parametric binauralizer \n\n", arg.hrtfCRendFileName );
+            goto cleanup;
         }
     }
 
diff --git a/scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c b/scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c
index 00520bb9245ccc99facd735ef262b8a55f9b633d..1c51ea1c074b191f22bf4075b06d79f02076641c 100644
--- a/scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c
+++ b/scripts/binauralRenderer_interface/Table_Format_Converter/generate_tables_from_rom_to_bin.c
@@ -833,7 +833,7 @@ char *create_hrtf_fastconv( RENDERER_TYPE rend_type, BINAURAL_INPUT_AUDIO_CONFIG
 
         latency_s = FASTCONV_HOA3_latency_s;
         hrtf_channels = HRTF_SH_CHANNELS;
-        num_taps = BINAURAL_NTAPS;
+        num_taps = BINAURAL_NTAPS_SBA;
     }
     else if ( input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_HOA2 )
     {
@@ -845,7 +845,7 @@ char *create_hrtf_fastconv( RENDERER_TYPE rend_type, BINAURAL_INPUT_AUDIO_CONFIG
 
         latency_s = FASTCONV_HOA2_latency_s;
         hrtf_channels = 9;
-        num_taps = BINAURAL_NTAPS;
+        num_taps = BINAURAL_NTAPS_SBA;
     }
     else if ( input_cfg == BINAURAL_INPUT_AUDIO_CONFIG_FOA )
     {
@@ -857,7 +857,7 @@ char *create_hrtf_fastconv( RENDERER_TYPE rend_type, BINAURAL_INPUT_AUDIO_CONFIG
 
         latency_s = FASTCONV_FOA_latency_s;
         hrtf_channels = 4;
-        num_taps = BINAURAL_NTAPS;
+        num_taps = BINAURAL_NTAPS_SBA;
     }
     else
     {
diff --git a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin
index 5efe72564afbb6dcd6eac5c4211395c9ccf62419..d2fe9167647709a8b12c5ddaac7af3409ae888b0 100644
--- a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin
+++ b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_16kHz.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5d7379a9a1cd7ee9dab898e7a8b9ee2f6f98033b70138d999643c3db74c995f7
-size 2035342
+oid sha256:7e6083e464f1f3f3e56bd5f55cfac39fbaa033c1c9a8b52125279058628230f8
+size 1988942
diff --git a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin
index 827f96bbd15a0291a5e0b6d9a4e71e822846aa6a..5be2ffc647ffe60b320fdf3ffba849258cf82b62 100644
--- a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin
+++ b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_32kHz.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b422950f686d303e82b7bf7d1344a1f47abf97a67ee040e2490f297936540e81
-size 2498562
+oid sha256:c806db52e44bf58bcbacd74139542d78f1e5c0d2a9119bcdda26cba210ee8130
+size 2452162
diff --git a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin
index 11c68020d8f7dec80d8c3afb88c670191726f859..3ae9682d81fa09b67b2a25ea80ce3fdf66dbbb0a 100644
--- a/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin
+++ b/scripts/binauralRenderer_interface/binaural_renderers_hrtf_data/ivas_binaural_48kHz.bin
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:af65c1e4fb562aa2631613c647816175299c7a75c6b0a4f6c9696fb26835d7fe
-size 2741010
+oid sha256:ebbf826bf08df11e31ec0f33666a34925e1e83288156ed70a331f05d1a8ffd36
+size 2694610