diff --git a/dbt-rise-core b/dbt-rise-core
index 17c0f71..54518de 160000
--- a/dbt-rise-core
+++ b/dbt-rise-core
@@ -1 +1 @@
-Subproject commit 17c0f71d400fbdaba9c7e7f40f88c3c08c1de56a
+Subproject commit 54518de7effb9b719f5169d51e51fb658e9085af
diff --git a/dbt-rise-riscv b/dbt-rise-riscv
index c0737a2..05f7051 160000
--- a/dbt-rise-riscv
+++ b/dbt-rise-riscv
@@ -1 +1 @@
-Subproject commit c0737a2f0096f48380238ff321a8aef1dc6432d8
+Subproject commit 05f7051db2886ddc94cb8b6573f6b6cd6b995cb3
diff --git a/src/sc_main.cpp b/src/sc_main.cpp
index b89c921..7f23ff3 100644
--- a/src/sc_main.cpp
+++ b/src/sc_main.cpp
@@ -72,14 +72,13 @@ int sc_main(int argc, char* argv[]) {
     std::unique_ptr<scc::configurable_tracer> tracer;
     if(auto trace_level = parser.get<unsigned>("trace-level")) {
         auto file_name = parser.get<std::string>("trace-file");
-        auto enable_sig_trace = (trace_level & 0x1) != 0;                           // bit0 enables sig trace
-        auto tx_trace_type = static_cast<scc::tracer::file_type>(trace_level >> 1); // bit3-bit1 define the kind of transaction trace
         auto trace_default_on = parser.is_set("trace-default-on");
         if(parser.is_set("trace-default-off"))
             cfg.set_value("scc_tracer.default_trace_enable", false);
         cfg.set_value("scc_tracer.tx_trace_type", static_cast<unsigned>(scc::tracer::file_type::FTR));
         cfg.set_value("scc_tracer.sig_trace_type", static_cast<unsigned>(scc::tracer::file_type::FST));
-        tracer = scc::make_unique<scc::configurable_tracer>(file_name, tx_trace_type, enable_sig_trace);
+        tracer = scc::make_unique<scc::configurable_tracer>(file_name, static_cast<bool>(trace_level & 0x2),
+                                                            static_cast<bool>(trace_level & 0x1));
     }
     ///////////////////////////////////////////////////////////////////////////
     // instantiate top level
diff --git a/vpvper b/vpvper
index 923024b..6413f14 160000
--- a/vpvper
+++ b/vpvper
@@ -1 +1 @@
-Subproject commit 923024bd82902bd15f55dd5e108d5823cb0c4add
+Subproject commit 6413f14b18658eab8223b30fbbe1216f6d26cc86