diff --git a/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.cpp b/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.cpp
index ddd1f51b..e2158155 100644
--- a/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.cpp
+++ b/SHADE_Engine/src/Graphics/MiddleEnd/Batching/SHBatch.cpp
@@ -218,9 +218,13 @@ namespace SHADE
     for (int i = 0; i < SHGraphicsConstants::NUM_FRAME_BUFFERS; ++i)
     {
       drawDataBuffer[i].Free();
+      drawDataBuffer[i] = {};
       transformDataBuffer[i].Free();
+      transformDataBuffer[i] = {};
       instancedIntegerBuffer[i].Free();
+      instancedIntegerBuffer[i] = {};
       matPropsBuffer[i].Free();
+      matPropsBuffer[i] = {};
     }
   }
 
diff --git a/SHADE_Engine/src/Graphics/SHVkUtil.cpp b/SHADE_Engine/src/Graphics/SHVkUtil.cpp
index 3a405e0d..040433cb 100644
--- a/SHADE_Engine/src/Graphics/SHVkUtil.cpp
+++ b/SHADE_Engine/src/Graphics/SHVkUtil.cpp
@@ -129,7 +129,7 @@ namespace SHADE
       // Otherwise just copy the data over
       else
       {
-        bufferHandle->MapWriteUnmap(src, size, 0, 0);
+        bufferHandle->WriteToMemory(src, size, 0, 0);
       }
     }
     else