diff --git a/src/sysc/core_complex.cpp b/src/sysc/core_complex.cpp
index 71edd05..cc201a2 100644
--- a/src/sysc/core_complex.cpp
+++ b/src/sysc/core_complex.cpp
@@ -155,7 +155,7 @@ public:
     void wait_until(uint64_t flags) override {
         SCCDEBUG(owner->name()) << "Sleeping until interrupt";
         do {
-            wait(wfi_evt);
+            sc_core::wait(wfi_evt);
         } while (this->reg.pending_trap == 0);
         PLAT::wait_until(flags);
     }
@@ -263,7 +263,7 @@ public:
     void create_cpu(std::string const& type, std::string const& backend, unsigned gdb_port, uint32_t hart_id){
         CREATE_CORE(tgc_c)
 #ifdef CORE_TGC_B
-        CREATE_CORE(tgc_c)
+        CREATE_CORE(tgc_b)
 #endif
 #ifdef CORE_TGC_D
         CREATE_CORE(tgc_d)
@@ -335,7 +335,7 @@ void core_complex::before_end_of_elaboration() {
 #ifdef WITH_SCV
     cpu->vm->setDisassEnabled(enable_disass.get_value() || m_db != nullptr);
 #else
-    vm->setDisassEnabled(enable_disass.get_value());
+    cpu->vm->setDisassEnabled(enable_disass.get_value());
 #endif
 }