diff --git a/SHADE_Engine/src/Assets/SHAssetManager.cpp b/SHADE_Engine/src/Assets/SHAssetManager.cpp
index d8bedfd3..b7cae8ff 100644
--- a/SHADE_Engine/src/Assets/SHAssetManager.cpp
+++ b/SHADE_Engine/src/Assets/SHAssetManager.cpp
@@ -464,7 +464,7 @@ namespace SHADE
       SHCompileAssetEvent compileShaderEvent
       {
         .assetName = newPath.filename().stem().string(),
-        .assetID = id,
+        .assetID = target,
         .assetType = AssetType::SHADER,
       };
       SHEventManager::BroadcastEvent<SHCompileAssetEvent>(compileShaderEvent, SH_ASSET_COMPILE_EVENT);
diff --git a/SHADE_Engine/src/Graphics/Pipeline/SHVkPipeline.cpp b/SHADE_Engine/src/Graphics/Pipeline/SHVkPipeline.cpp
index 77559de3..dd050627 100644
--- a/SHADE_Engine/src/Graphics/Pipeline/SHVkPipeline.cpp
+++ b/SHADE_Engine/src/Graphics/Pipeline/SHVkPipeline.cpp
@@ -362,7 +362,10 @@ namespace SHADE
   {
     // if it was created before, destroy it
     if (created)
+    {
+      logicalDeviceHdl->WaitIdle();
       logicalDeviceHdl->GetVkLogicalDevice().destroyPipeline(vkPipeline, nullptr);
+    }
 
     // Set to false again. If creation succeeds after this, this will be true
     created = false;