diff --git a/lib_com/count.c b/lib_com/count.c
index b93414d8a4cbd123e05fd700533d1da6ad012d58..eaf6f04f422786a7f67642b6e3bfca292eb2afde 100644
--- a/lib_com/count.c
+++ b/lib_com/count.c
@@ -1082,7 +1082,7 @@ void WMOPS_destroy( void )
     {
         if ( NULL != objectName[i] )
         {
-            free_( objectName[i] );
+            free( objectName[i] );
             objectName[i] = NULL;
         }
     }
diff --git a/lib_com/options.h b/lib_com/options.h
index bc5e5f09e89d17ba1022232b358623ea218aa10e..2345dd6a6b4f35ffd7cd1a569a9d59b660e7ed5a 100644
--- a/lib_com/options.h
+++ b/lib_com/options.h
@@ -54,11 +54,9 @@
 
 #define SUPPORT_JBM_TRACEFILE                   /* Support for JBM tracefile, which is needed for 3GPP objective/subjective testing, but not relevant for real-world implementations */
 
-//#define WMOPS                                   /* Activate complexity and memory counters */
+/*#define WMOPS*/                                   /* Activate complexity and memory counters */
 #ifdef WMOPS
 /*#define WMOPS_PER_FRAME*/                     /* Output per-frame complexity (writes one float value per frame to the file "wmops_analysis") */
-/*#define WMOPS_DETAIL*/                        /* Output detailed complexity printout for every function. Increases runtime overhead */
-/*#define WMOPS_WC_FRAME_ANALYSIS*/             /* Output detailed complexity analysis for the worst-case frame */
 /*#define MEM_COUNT_DETAILS*/                   /* Output detailed memory analysis for the worst-case frame (writes to the file "mem_analysis.csv") */
 #endif
 
diff --git a/lib_dec/amr_wb_dec.c b/lib_dec/amr_wb_dec.c
index 09242c2a3cbdc2e2ffbc3494a7ffc80d4d6a2cf6..7a5baa92c1d314a1deaf9e8ae824c8571c38ad34 100644
--- a/lib_dec/amr_wb_dec.c
+++ b/lib_dec/amr_wb_dec.c
@@ -101,6 +101,8 @@ ivas_error amr_wb_dec(
     TCX_LTP_DEC_HANDLE hTcxLtpDec = st->hTcxLtpDec;
     ivas_error error;
 
+    push_wmops( "amr_wb_dec" );
+
     error = IVAS_ERR_OK;
 
     /*------------------------------------------------------------------*
@@ -810,6 +812,7 @@ ivas_error amr_wb_dec(
     /* final output of synthesis signal */
     mvr2r( synth_out, output, output_frame );
 
+    pop_wmops();
 
     return error;
 }
diff --git a/lib_dec/amr_wb_dec_fx.c b/lib_dec/amr_wb_dec_fx.c
index f2acdde1aa2fa8058a2e4ca5779134cbe78a44b6..ef5b4299e888f86b5ad07a1f8c20a62168346af8 100644
--- a/lib_dec/amr_wb_dec_fx.c
+++ b/lib_dec/amr_wb_dec_fx.c
@@ -88,10 +88,13 @@ ivas_error amr_wb_dec_fx(
     hTcxLtpDec = st_fx->hTcxLtpDec;
     hTcxDec = st_fx->hTcxDec;
 
+    push_wmops( "amr_wb_dec_fx" );
+
     error = IVAS_ERR_OK;
     st_fx->idchan = 0;
     move16();
     move16();
+
     /*------------------------------------------------------------------*
      * Initialization
      *------------------------------------------------------------------*/
@@ -1111,6 +1114,7 @@ ivas_error amr_wb_dec_fx(
     /* final output of synthesis signal */
     syn_output_fx( st_fx->codec_mode, synth_out_fx, output_frame, output_sp, st_fx->Q_syn2 );
 
+    pop_wmops();
 
     return error;
 }
diff --git a/lib_dec/evs_dec_fx.c b/lib_dec/evs_dec_fx.c
index ba94c988a1b4fef895855f96612d021830f7e542..eb44da8c98e245a8b2925dfd1ef72c446865bfac 100644
--- a/lib_dec/evs_dec_fx.c
+++ b/lib_dec/evs_dec_fx.c
@@ -67,6 +67,9 @@ ivas_error evs_dec_fx(
     TCX_LTP_DEC_HANDLE hTcxLtpDec;
     TCX_DEC_HANDLE hTcxDec;
     ivas_error error;
+
+    push_wmops( "evs_dec_fx" );
+
 #ifdef BASOP_NOGLOB_DECLARE_LOCAL
     Flag Overflow = 0;
     move16();
@@ -1502,6 +1505,9 @@ ivas_error evs_dec_fx(
         }
         updt_dec_common_fx( st_fx, hq_core_type, concealWholeFrameTmp, output_sp, Qpostd );
     }
+
+    pop_wmops();
+
     return IVAS_ERR_OK;
 }
 #endif
diff --git a/lib_enc/amr_wb_enc.c b/lib_enc/amr_wb_enc.c
index 054332d5fc4b9ab31c11a0e1086e88d12a109110..8b7281bc30c8d5ac67b75f6701af18cd4b19b526 100644
--- a/lib_enc/amr_wb_enc.c
+++ b/lib_enc/amr_wb_enc.c
@@ -102,6 +102,8 @@ void amr_wb_enc(
 
     LPD_state_HANDLE hLPDmem = st->hLPDmem;
 
+    push_wmops( "amr_wb_enc" );
+
     /*------------------------------------------------------------------*
      * Initialization
      *------------------------------------------------------------------*/
@@ -518,6 +520,7 @@ void amr_wb_enc(
     /* update main codec paramaters */
     updt_enc_common( st );
 
+    pop_wmops();
 
     return;
 }
diff --git a/lib_enc/amr_wb_enc_fx.c b/lib_enc/amr_wb_enc_fx.c
index d2b2569b533e07439988c52ad28d0b3d2c0096bc..b07fc980fea3c2ed7a6003cbcf4a4525ab0e112b 100644
--- a/lib_enc/amr_wb_enc_fx.c
+++ b/lib_enc/amr_wb_enc_fx.c
@@ -89,6 +89,8 @@ void amr_wb_enc_fx(
     TD_BWE_ENC_HANDLE hBWE_TD = st->hBWE_TD;
     FD_BWE_ENC_HANDLE hBWE_FD = st->hBWE_FD;
 
+    push_wmops( "amr_wb_enc_fx" );
+
     /*------------------------------------------------------------------*
      * Initialization
      *------------------------------------------------------------------*/
@@ -609,6 +611,8 @@ void amr_wb_enc_fx(
     dbgwrite( &st->vad_flag, sizeof( short ), 1, input_frame, "res/vad_flag" );
 #endif
 
+    pop_wmops();
+
     return;
 }
 /*---------------------------------------------------------------------*
diff --git a/lib_enc/evs_enc_fx.c b/lib_enc/evs_enc_fx.c
index ae2dd4aedc7a72fddbbce6ef725a300137d4e8d2..7a86e177ba50a02bf7de22c324f4f7b2960a7309 100644
--- a/lib_enc/evs_enc_fx.c
+++ b/lib_enc/evs_enc_fx.c
@@ -92,6 +92,7 @@ ivas_error evs_enc_fx(
 
     error = IVAS_ERR_OK;
 
+    push_wmops( "evs_enc_fx" );
 
     Q_shb_spch = 0;
     move16(); /* to avoid compiler warnings */
@@ -612,6 +613,8 @@ ivas_error evs_enc_fx(
     dbgwrite( &st->vad_flag, sizeof( short ), 1, input_frame, "res/vad_flag" );
 #endif
 
+    pop_wmops();
+
     return error;
 }