diff --git a/DRAMSys/simulator/src/controller/scheduler/SMS.cpp b/DRAMSys/simulator/src/controller/scheduler/SMS.cpp
index 82e9f6e0..7f505a5d 100644
--- a/DRAMSys/simulator/src/controller/scheduler/SMS.cpp
+++ b/DRAMSys/simulator/src/controller/scheduler/SMS.cpp
@@ -133,6 +133,11 @@ bool SMS::selectSJF(sc_time memClk, std::map<Thread, ReadyBatch*>::iterator &las
 
 bool SMS::selectRR(sc_time memClk, std::map<Thread, ReadyBatch*>::iterator &nextSelectedThread)
 {
+  // no request for this channel, the readybatches map is empty then return
+  if (readybatches.empty()) {
+    return false;
+  }
+
   // pick a non-empty ready batch
   std::map<Thread, ReadyBatch*>::iterator savedOriginalNextSelectedThread = nextSelectedThread;
   while ((*nextSelectedThread).second->isEmpty())
diff --git a/DRAMSys/simulator/src/simulation/TracePlayerListener.h b/DRAMSys/simulator/src/simulation/TracePlayerListener.h
index 95c52773..bec9f043 100644
--- a/DRAMSys/simulator/src/simulation/TracePlayerListener.h
+++ b/DRAMSys/simulator/src/simulation/TracePlayerListener.h
@@ -43,6 +43,7 @@ class TracePlayerListener
 public:
     virtual void tracePlayerTerminates() = 0;
     virtual void transactionFinished() = 0;
+    virtual ~TracePlayerListener(){};
 };
 
 #endif // TRACEPLAYERLISTENER_H
diff --git a/DRAMSys/simulator/src/simulation/TraceSetup.h b/DRAMSys/simulator/src/simulation/TraceSetup.h
index a9f0b8e5..a11b4abe 100644
--- a/DRAMSys/simulator/src/simulation/TraceSetup.h
+++ b/DRAMSys/simulator/src/simulation/TraceSetup.h
@@ -53,6 +53,7 @@ public:
 
     virtual void tracePlayerTerminates() override;
     virtual void transactionFinished() override;
+    virtual ~traceSetup(){};
 
 private:
     unsigned int NumberOfTracePlayers;