diff --git a/lib_dec/ivas_dec.c b/lib_dec/ivas_dec.c
index 4eefcc8835988ae350424dff72b5fd48e72bb2a6..899778316a29164f28771188eab411ac9ae56549 100644
--- a/lib_dec/ivas_dec.c
+++ b/lib_dec/ivas_dec.c
@@ -560,7 +560,6 @@ ivas_error ivas_dec(
         }
     }
 #ifdef MASA_AND_OBJECTS
-    // Todo OMASA JBM: Check here for p_output vs. output and possibly also metadata indices
     else if ( st_ivas->ivas_format == MASA_ISM_FORMAT )
     {
         int16_t nchan_ism, nchan_transport_ism;
diff --git a/lib_dec/ivas_dirac_dec.c b/lib_dec/ivas_dirac_dec.c
index 711d286dcef9d5eeb0687cd7bed9eb49fd1c9cc6..d33f06765e5abf0158494747b2afaeb1adc84ca1 100644
--- a/lib_dec/ivas_dirac_dec.c
+++ b/lib_dec/ivas_dirac_dec.c
@@ -929,7 +929,6 @@ ivas_error ivas_dirac_dec_config(
             else
             {
                 /* This is required to keep BE in rate switching. This probably means that 1TC and 2TC MASA perform differently. */
-                /* TODO: refactor merge: does this need to be adapted for OMASA? */
 #ifdef SPLIT_REND_WITH_HEAD_ROT_PARAMBIN
                 if ( st_ivas->hDiracDecBin[0]->h_freq_domain_decorr_ap_params != NULL && !( st_ivas->ivas_format == MASA_FORMAT && st_ivas->nSCE > 0 ) )
 #else
diff --git a/lib_dec/ivas_objectRenderer_internal.c b/lib_dec/ivas_objectRenderer_internal.c
index d65b51ab76c2ab1a24db4c9882536591798ea92a..c37210c9a79bd4460b5f62299cffceb3ba3cd725 100644
--- a/lib_dec/ivas_objectRenderer_internal.c
+++ b/lib_dec/ivas_objectRenderer_internal.c
@@ -192,7 +192,7 @@ ivas_error ivas_td_binaural_renderer_sf(
 #ifdef MASA_AND_OBJECTS
     if ( st_ivas->ivas_format == MASA_ISM_FORMAT )
     {
-        ism_md_subframe_update_jbm = max( 0, st_ivas->hTcBuffer->nb_subframes - 4 ); /* Todo Nokia: Update this value to match the value of nonJBM rendering. */
+        ism_md_subframe_update_jbm = max( 0, st_ivas->hTcBuffer->nb_subframes - 2 );
     }
 #endif