diff --git a/src/fsfw/health/HealthTable.h b/src/fsfw/health/HealthTable.h
index 60e00f92c..076228c11 100644
--- a/src/fsfw/health/HealthTable.h
+++ b/src/fsfw/health/HealthTable.h
@@ -9,8 +9,8 @@
 
 class HealthTable : public HealthTableIF, public SystemObject {
  public:
-  HealthTable(object_id_t objectid);
-  virtual ~HealthTable();
+  explicit HealthTable(object_id_t objectid);
+  ~HealthTable() override;
 
   void setMutexTimeout(MutexIF::TimeoutType timeoutType, uint32_t timeoutMs);
 
diff --git a/src/fsfw/objectmanager/ObjectManager.cpp b/src/fsfw/objectmanager/ObjectManager.cpp
index 2017938a1..a0278988f 100644
--- a/src/fsfw/objectmanager/ObjectManager.cpp
+++ b/src/fsfw/objectmanager/ObjectManager.cpp
@@ -21,7 +21,7 @@ void ObjectManager::setObjectFactoryFunction(produce_function_t objFactoryFunc,
   this->factoryArgs = factoryArgs;
 }
 
-ObjectManager::ObjectManager() {}
+ObjectManager::ObjectManager() = default;
 
 ObjectManager::~ObjectManager() {
   for (auto const& iter : objectList) {
@@ -36,7 +36,7 @@ ReturnValue_t ObjectManager::insert(object_id_t id, SystemObjectIF* object) {
     // sif::debug << "ObjectManager::insert: Object " << std::hex
     //            << (int)id << std::dec << " inserted." << std::endl;
 #endif
-    return this->RETURN_OK;
+    return HasReturnvaluesIF::RETURN_OK;
   } else {
 #if FSFW_CPP_OSTREAM_ENABLED == 1
     sif::error << "ObjectManager::insert: Object ID " << std::hex << static_cast<uint32_t>(id)
@@ -53,7 +53,7 @@ ReturnValue_t ObjectManager::insert(object_id_t id, SystemObjectIF* object) {
 }
 
 ReturnValue_t ObjectManager::remove(object_id_t id) {
-  if (this->getSystemObject(id) != NULL) {
+  if (this->getSystemObject(id) != nullptr) {
     this->objectList.erase(id);
 #if FSFW_CPP_OSTREAM_ENABLED == 1
     // sif::debug << "ObjectManager::removeObject: Object " << std::hex
diff --git a/unittests/CatchSetup.cpp b/unittests/CatchSetup.cpp
index 3b918e05f..1bdc20f4e 100644
--- a/unittests/CatchSetup.cpp
+++ b/unittests/CatchSetup.cpp
@@ -31,7 +31,5 @@ int customSetup() {
 }
 
 int customTeardown() {
-  ObjectManager* objMan = ObjectManager::instance();
-  delete objMan;
   return 0;
 }