diff --git a/DRAMSys/library/src/common/TlmRecorder.cpp b/DRAMSys/library/src/common/TlmRecorder.cpp
index 8619e3ca..e470cf27 100644
--- a/DRAMSys/library/src/common/TlmRecorder.cpp
+++ b/DRAMSys/library/src/common/TlmRecorder.cpp
@@ -49,9 +49,9 @@
 using namespace std;
 
 
-TlmRecorder::TlmRecorder(sc_module_name /*name*/, string uri,
-                         string dbname) : sqlScriptURI(uri), dbName(dbname), totalNumTransactions(1),
-    simulationTimeCoveredByRecording(SC_ZERO_TIME)
+TlmRecorder::TlmRecorder(sc_module_name name, string uri, string dbname) :
+    sc_module(name), sqlScriptURI(uri), dbName(dbname),
+    totalNumTransactions(1), simulationTimeCoveredByRecording(SC_ZERO_TIME)
 {
     recordedData.reserve(transactionCommitRate);
     setUpTransactionTerminatingPhases();
diff --git a/DRAMSys/library/src/common/TlmRecorder.h b/DRAMSys/library/src/common/TlmRecorder.h
index c69ad4f6..bfd4ae9f 100644
--- a/DRAMSys/library/src/common/TlmRecorder.h
+++ b/DRAMSys/library/src/common/TlmRecorder.h
@@ -61,7 +61,7 @@ public:
     std::string sqlScriptURI;
     std::string dbName;
 
-    TlmRecorder(sc_module_name /*name*/, string uri, string dbname);
+    TlmRecorder(sc_module_name name, string uri, string dbname);
     ~TlmRecorder();
 
     void recordMCconfig(string mcconfig)
diff --git a/DRAMSys/library/src/controller/checker/CheckerDDR3.cpp b/DRAMSys/library/src/controller/checker/CheckerDDR3.cpp
index 6dc57d5d..affd8195 100644
--- a/DRAMSys/library/src/controller/checker/CheckerDDR3.cpp
+++ b/DRAMSys/library/src/controller/checker/CheckerDDR3.cpp
@@ -147,7 +147,7 @@ sc_time CheckerDDR3::delayToSatisfyConstraints(Command command, Bank bank)
     {
         reportFatal("CheckerDDR3", "Unknown command!");
     }
-    // Check if bus is free
+    // Check if command bus is free
     if (lastScheduled.isValidCommand())
         minTimeToWait = std::max(minTimeToWait, lastScheduled.getStart() + memSpec->clk);
 
diff --git a/DRAMSys/library/src/error/errormodel.cpp b/DRAMSys/library/src/error/errormodel.cpp
index 861df60a..e2329750 100644
--- a/DRAMSys/library/src/error/errormodel.cpp
+++ b/DRAMSys/library/src/error/errormodel.cpp
@@ -112,13 +112,13 @@ void errorModel::init()
     markBitFlips();
 }
 
-errorModel::errorModel(sc_module_name /*name*/, libDRAMPower *dp)
+errorModel::errorModel(sc_module_name name, libDRAMPower *dp) : sc_module(name)
 {
     this->DRAMPower = dp;
     init();
 }
 
-errorModel::errorModel(sc_module_name /*name*/)
+errorModel::errorModel(sc_module_name name) : sc_module(name)
 {
     init();
 }
diff --git a/DRAMSys/library/src/error/errormodel.h b/DRAMSys/library/src/error/errormodel.h
index e562401c..1f4e3b71 100644
--- a/DRAMSys/library/src/error/errormodel.h
+++ b/DRAMSys/library/src/error/errormodel.h
@@ -46,8 +46,8 @@
 class errorModel : public sc_module
 {
 public:
-    errorModel(sc_module_name /*name*/, libDRAMPower *dp);
-    errorModel(sc_module_name /*name*/);
+    errorModel(sc_module_name, libDRAMPower *);
+    errorModel(sc_module_name);
     ~errorModel();
 
     // Access Methods:
diff --git a/DRAMSys/library/src/simulation/Arbiter.cpp b/DRAMSys/library/src/simulation/Arbiter.cpp
index 1c1074a2..3b7e8217 100644
--- a/DRAMSys/library/src/simulation/Arbiter.cpp
+++ b/DRAMSys/library/src/simulation/Arbiter.cpp
@@ -40,7 +40,8 @@
 using namespace std;
 using namespace tlm;
 
-Arbiter::Arbiter(sc_module_name /*name*/) : payloadEventQueue(this, &Arbiter::peqCallback)
+Arbiter::Arbiter(sc_module_name name) :
+    sc_module(name), payloadEventQueue(this, &Arbiter::peqCallback)
 {
     // The arbiter communicates with one or more memory unity through one or more sockets (one or more memory channels).
     // Each of the arbiter's initiator sockets is bound to a memory controller's target socket.
diff --git a/DRAMSys/library/src/simulation/DRAMSys.cpp b/DRAMSys/library/src/simulation/DRAMSys.cpp
index 21be54a1..db9796d4 100644
--- a/DRAMSys/library/src/simulation/DRAMSys.cpp
+++ b/DRAMSys/library/src/simulation/DRAMSys.cpp
@@ -63,9 +63,9 @@
 
 using namespace std;
 
-DRAMSys::DRAMSys(sc_module_name __attribute__((unused)) name,
+DRAMSys::DRAMSys(sc_module_name name,
                  string simulationToRun,
-                 string pathToResources) : tSocket("DRAMSys_tSocket")
+                 string pathToResources) : sc_module(name), tSocket("DRAMSys_tSocket")
 {
     // Initialize ecc pointer
     ecc = nullptr;
@@ -79,6 +79,7 @@ DRAMSys::DRAMSys(sc_module_name __attribute__((unused)) name,
     string simconfig;
     string thermalconfig;
 
+    // TODO: Setup never used?
     Setup setup(simulationToRun,
                 memspec,
                 mcconfig,
diff --git a/DRAMSys/library/src/simulation/Dram.cpp b/DRAMSys/library/src/simulation/Dram.cpp
index 2d0eb8d2..76a3717f 100644
--- a/DRAMSys/library/src/simulation/Dram.cpp
+++ b/DRAMSys/library/src/simulation/Dram.cpp
@@ -61,7 +61,7 @@ using namespace std;
 using namespace tlm;
 using namespace Data;
 
-Dram::Dram(sc_module_name) : tSocket("socket")
+Dram::Dram(sc_module_name name) : sc_module(name), tSocket("socket")
 {
     // Adjust number of bytes per burst dynamically to the selected ecc controller
     bytesPerBurst = Configuration::getInstance()
diff --git a/DRAMSys/library/src/simulation/DramDDR3.h b/DRAMSys/library/src/simulation/DramDDR3.h
index 1db185df..fef6c7fa 100644
--- a/DRAMSys/library/src/simulation/DramDDR3.h
+++ b/DRAMSys/library/src/simulation/DramDDR3.h
@@ -45,6 +45,7 @@ class DramDDR3 : public Dram
 public:
     DramDDR3(sc_module_name);
     SC_HAS_PROCESS(DramDDR3);
+    virtual ~DramDDR3() {}
 };
 
 #endif // DRAMDDR3_H
diff --git a/DRAMSys/library/src/simulation/DramDDR4.h b/DRAMSys/library/src/simulation/DramDDR4.h
index 358ec454..3979c950 100644
--- a/DRAMSys/library/src/simulation/DramDDR4.h
+++ b/DRAMSys/library/src/simulation/DramDDR4.h
@@ -45,6 +45,7 @@ class DramDDR4 : public Dram
 public:
     DramDDR4(sc_module_name);
     SC_HAS_PROCESS(DramDDR4);
+    virtual ~DramDDR4() {}
 };
 
 #endif // DRAMDDR4_H
diff --git a/DRAMSys/library/src/simulation/DramRecordable.h b/DRAMSys/library/src/simulation/DramRecordable.h
index 2859b749..aa09e778 100644
--- a/DRAMSys/library/src/simulation/DramRecordable.h
+++ b/DRAMSys/library/src/simulation/DramRecordable.h
@@ -45,19 +45,17 @@
 using namespace tlm;
 
 template<class BaseDram>
-class DramRecordable : public BaseDram
+class DramRecordable final : public BaseDram
 {
 public:
-    DramRecordable(sc_module_name name, TlmRecorder *tlmRecorder);
+    DramRecordable(sc_module_name, TlmRecorder *);
     SC_HAS_PROCESS(DramRecordable);
 
-    virtual ~DramRecordable();
-
-protected:
-    virtual tlm_sync_enum nb_transport_fw(tlm_generic_payload &payload,
-                                          tlm_phase &phase, sc_time &delay);
+    ~DramRecordable();
 
 private:
+    tlm_sync_enum nb_transport_fw(tlm_generic_payload &payload,
+                                          tlm_phase &phase, sc_time &delay);
     TlmRecorder *tlmRecorder;
     sc_time powerWindowSize = Configuration::getInstance().memSpec->clk *
                               Configuration::getInstance().WindowSize;
diff --git a/DRAMSys/library/src/simulation/StlPlayer.h b/DRAMSys/library/src/simulation/StlPlayer.h
index cace8884..30f774ef 100644
--- a/DRAMSys/library/src/simulation/StlPlayer.h
+++ b/DRAMSys/library/src/simulation/StlPlayer.h
@@ -50,11 +50,11 @@ template<bool relative>
 class StlPlayer : public TracePlayer
 {
 public:
-    StlPlayer(sc_module_name /*name*/,
+    StlPlayer(sc_module_name name,
               string pathToTrace,
               sc_time playerClk,
               TracePlayerListener *listener) :
-        TracePlayer(listener),
+        TracePlayer(name, listener),
         file(pathToTrace)
     {
         if (!file.is_open())
diff --git a/DRAMSys/library/src/simulation/TraceGenerator.h b/DRAMSys/library/src/simulation/TraceGenerator.h
index c6e5cd12..b96b5456 100644
--- a/DRAMSys/library/src/simulation/TraceGenerator.h
+++ b/DRAMSys/library/src/simulation/TraceGenerator.h
@@ -46,8 +46,8 @@ using namespace tlm;
 struct TraceGenerator : public TracePlayer
 {
 public:
-    TraceGenerator(sc_module_name /*name*/, unsigned int clkMhz,
-                   TracePlayerListener *listener) : TracePlayer(listener), transCounter(0)
+    TraceGenerator(sc_module_name name, unsigned int clkMhz, TracePlayerListener *listener)
+        : TracePlayer(name, listener), transCounter(0)
     {
         if (clkMhz == 0)
             clk = Configuration::getInstance().memSpec->clk;
diff --git a/DRAMSys/library/src/simulation/TracePlayer.cpp b/DRAMSys/library/src/simulation/TracePlayer.cpp
index 793dd904..889124b3 100644
--- a/DRAMSys/library/src/simulation/TracePlayer.cpp
+++ b/DRAMSys/library/src/simulation/TracePlayer.cpp
@@ -38,7 +38,8 @@
 
 #include "TracePlayer.h"
 
-TracePlayer::TracePlayer(TracePlayerListener *listener) :
+TracePlayer::TracePlayer(sc_module_name name, TracePlayerListener *listener) :
+    sc_module(name),
     payloadEventQueue(this, &TracePlayer::peqCallback),
     numberOfTransactions(0),
     transactionsSent(0),
diff --git a/DRAMSys/library/src/simulation/TracePlayer.h b/DRAMSys/library/src/simulation/TracePlayer.h
index fbc2e004..a62ff00a 100644
--- a/DRAMSys/library/src/simulation/TracePlayer.h
+++ b/DRAMSys/library/src/simulation/TracePlayer.h
@@ -60,7 +60,7 @@ struct TracePlayer : public sc_module
 {
 public:
     tlm_utils::simple_initiator_socket<TracePlayer> iSocket;
-    TracePlayer(TracePlayerListener *listener);
+    TracePlayer(sc_module_name name, TracePlayerListener *listener);
     virtual void nextPayload() = 0;
     unsigned int getNumberOfLines(string pathToTrace);