diff --git a/src/DesignCompile/CompileExpression.cpp b/src/DesignCompile/CompileExpression.cpp
index 745692c3dc..3c4a110665 100644
--- a/src/DesignCompile/CompileExpression.cpp
+++ b/src/DesignCompile/CompileExpression.cpp
@@ -403,6 +403,7 @@ bool getStringVal(std::string &result, expr *val) {
     if (sval) {
       if (sval->format == vpiStringVal || sval->format == vpiBinStrVal) {
         result = sval->value.str;
+        delete sval;
         return true;
       }
     }
diff --git a/third_party/UHDM b/third_party/UHDM
index 7d00f4fc2c..c60ee31743 160000
--- a/third_party/UHDM
+++ b/third_party/UHDM
@@ -1 +1 @@
-Subproject commit 7d00f4fc2c99e29e5e08692c335e4ed1b99fece2
+Subproject commit c60ee3174393a50d609f3075578bbc82aaf03153
diff --git a/third_party/tests/CoresSweRVMP/CoresSweRVMP.log b/third_party/tests/CoresSweRVMP/CoresSweRVMP.log
index 49d3a2f239..914bb61648 100644
--- a/third_party/tests/CoresSweRVMP/CoresSweRVMP.log
+++ b/third_party/tests/CoresSweRVMP/CoresSweRVMP.log
@@ -131,14 +131,14 @@ CMake Deprecation Warning at CMakeLists.txt:1 (cmake_minimum_required):
   CMake that the project does not need compatibility with older versions.
 
 
--- Configuring done (0.0s)
+-- Configuring done (0.1s)
 -- Generating done (0.0s)
 -- Build files have been written to: ${SURELOG_DIR}/build/regression/CoresSweRVMP/slpp_all/mp_preprocess
 [  6%] Generating 10_lsu_bus_intf.sv
-[ 12%] Generating 11_ifu_bp_ctl.sv
+[ 18%] Generating 11_ifu_bp_ctl.sv
 [ 18%] Generating 12_beh_lib.sv
-[ 25%] Generating 13_ifu_mem_ctl.sv
-[ 31%] Generating 14_mem_lib.sv
+[ 25%] Generating 14_mem_lib.sv
+[ 31%] Generating 13_ifu_mem_ctl.sv
 [ 37%] Generating 15_exu.sv
 [ 43%] Generating 16_dec_decode_ctl.sv
 [ 50%] Generating 1_lsu_stbuf.sv
@@ -146,7 +146,7 @@ CMake Deprecation Warning at CMakeLists.txt:1 (cmake_minimum_required):
 [ 62%] Generating 3_rvjtag_tap.sv
 [ 68%] Generating 4_dec_tlu_ctl.sv
 [ 75%] Generating 5_lsu_bus_buffer.sv
-[ 87%] Generating 7_axi4_to_ahb.sv
+[ 81%] Generating 7_axi4_to_ahb.sv
 [ 87%] Generating 6_dbg.sv
 [ 93%] Generating 8_ifu_aln_ctl.sv
 [100%] Generating 9_tb_top.sv