diff --git a/src/Algorithm.cpp b/src/Algorithm.cpp
index f00bc1090..6215dd090 100644
--- a/src/Algorithm.cpp
+++ b/src/Algorithm.cpp
@@ -332,6 +332,7 @@ Algorithm::createPipeline()
     vk::Pipeline pipeline =
       this->mDevice->createComputePipeline(*this->mPipelineCache, pipelineInfo);
     this->mPipeline = std::make_shared<vk::Pipeline>(pipeline);
+    this->mFreePipeline = true;
 #endif
 
     // TODO: Update to consistent
diff --git a/src/Manager.cpp b/src/Manager.cpp
index 9f25e1826..ea152f1a8 100644
--- a/src/Manager.cpp
+++ b/src/Manager.cpp
@@ -117,7 +117,6 @@ Manager::destroy() {
     if (this->mDebugReportCallback) {
         this->mInstance->destroyDebugReportCallbackEXT(
           this->mDebugReportCallback, nullptr, this->mDebugDispatcher);
-        this->mInstance = nullptr;
         KP_LOG_DEBUG("Kompute Manager Destroyed Debug Report Callback");
     }
 #endif