diff --git a/renderdoc/driver/vulkan/vk_common.cpp b/renderdoc/driver/vulkan/vk_common.cpp
index 1580a0b5f..f926bbcff 100644
--- a/renderdoc/driver/vulkan/vk_common.cpp
+++ b/renderdoc/driver/vulkan/vk_common.cpp
@@ -1920,8 +1920,8 @@ static void SerialiseNext(Serialiser *ser, const void *&pNext)
 	// VKTODOLOW serialise out whether there is a next structure, its type, and contents
 	if(ser->IsReading())
 		pNext = NULL;
-	else
-		RDCASSERT(pNext == NULL);
+	//else
+		//RDCASSERT(pNext == NULL);
 }
 
 template<typename T>
diff --git a/renderdoc/driver/vulkan/vk_common.h b/renderdoc/driver/vulkan/vk_common.h
index 3f7326a81..f36ac7c73 100644
--- a/renderdoc/driver/vulkan/vk_common.h
+++ b/renderdoc/driver/vulkan/vk_common.h
@@ -70,7 +70,7 @@ PrimitiveTopology MakePrimitiveTopology(VkPrimitiveTopology Topo, uint32_t patch
 // structure for casting to easily iterate and template specialising Serialise
 struct VkGenericStruct
 {
-	VkStructureType type;
+	VkStructureType sType;
 	const VkGenericStruct *pNext;
 };
 
diff --git a/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp
index ddccd8db6..b92755872 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp
@@ -1204,7 +1204,7 @@ bool WrappedVulkan::Serialise_vkCmdPipelineBarrier(
 
 	for(uint32_t i=0; i < memCount; i++)
 	{
-		SERIALISE_ELEMENT(VkStructureType, stype, ((VkGenericStruct *)ppMemBarriers[i])->type);
+		SERIALISE_ELEMENT(VkStructureType, stype, ((VkGenericStruct *)ppMemBarriers[i])->sType);
 
 		if(stype == VK_STRUCTURE_TYPE_MEMORY_BARRIER)
 		{
@@ -1284,14 +1284,14 @@ void WrappedVulkan::vkCmdPipelineBarrier(
 		{
 			VkGenericStruct *header = (VkGenericStruct *)ppMemBarriers[i];
 
-			if(header->type == VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER)
+			if(header->sType == VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER)
 			{
 				VkImageMemoryBarrier barrier = *(VkImageMemoryBarrier *)header;
 				barrier.image = Unwrap(barrier.image);
 				im.push_back(barrier);
 				unwrappedBarriers[i] = &im.back();
 			}
-			else if(header->type == VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER)
+			else if(header->sType == VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER)
 			{
 				VkBufferMemoryBarrier barrier = *(VkBufferMemoryBarrier *)header;
 				barrier.buffer = Unwrap(barrier.buffer);
@@ -1322,7 +1322,7 @@ void WrappedVulkan::vkCmdPipelineBarrier(
 
 		for(uint32_t i=0; i < memBarrierCount; i++)
 		{
-			VkStructureType stype = ((VkGenericStruct *)ppMemBarriers[i])->type;
+			VkStructureType stype = ((VkGenericStruct *)ppMemBarriers[i])->sType;
 
 			if(stype == VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER)
 				imTrans.push_back(*((VkImageMemoryBarrier *)ppMemBarriers[i]));