diff --git a/rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp b/rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp
index 446d4f0063..2bf32d1eae 100644
--- a/rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp
+++ b/rpcs3/Emu/RSX/VK/VKProgramPipeline.cpp
@@ -559,7 +559,7 @@ namespace vk
 			};
 
 			{
-				std::lock_guard lock(m_descriptor_set);
+				//std::lock_guard lock(m_descriptor_set);
 				const bool cache_is_valid = m_descriptor_template_cache_id == m_descriptor_set.cache_id();
 
 				for (unsigned i = 0; i < m_descriptor_slots.size(); ++i)
diff --git a/rpcs3/Emu/RSX/VK/VKVertexProgram.cpp b/rpcs3/Emu/RSX/VK/VKVertexProgram.cpp
index a9fb828c18..23d40394bd 100644
--- a/rpcs3/Emu/RSX/VK/VKVertexProgram.cpp
+++ b/rpcs3/Emu/RSX/VK/VKVertexProgram.cpp
@@ -82,8 +82,7 @@ void VKVertexDecompilerThread::insertHeader(std::stringstream &OS)
 	OS <<
 		// Variable redirection
 		"#define get_draw_params() draw_parameters[draw_parameters_offset]\n"
-		"#define vs_context_offset get_draw_params().vs_context_offset\n"
-		"#define xform_constants_offset get_draw_params().xform_constants_offset\n\n"
+		"#define vs_context_offset get_draw_params().vs_context_offset\n\n"
 		// Helpers
 		"#define get_vertex_context() vertex_contexts[vs_context_offset]\n"
 		"#define get_user_clip_config() get_vertex_context().user_clip_configuration_bits\n\n";
@@ -410,6 +409,8 @@ void VKVertexDecompilerThread::insertMainStart(std::stringstream & OS)
 			OS << "	vec4 " << PI.name << "= read_location(" << std::to_string(PI.location) << ");\n";
 		}
 	}
+
+	OS << "\nuint xform_constants_offset = get_draw_params().xform_constants_offset;\n\n";
 }
 
 void VKVertexDecompilerThread::insertMainEnd(std::stringstream & OS)
diff --git a/rpcs3/Emu/RSX/VK/vkutils/descriptors.cpp b/rpcs3/Emu/RSX/VK/vkutils/descriptors.cpp
index 4152e4b83a..4b30116925 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/descriptors.cpp
+++ b/rpcs3/Emu/RSX/VK/vkutils/descriptors.cpp
@@ -465,7 +465,7 @@ namespace vk
 			return;
 		}
 
-		std::lock_guard lock(m_storage_lock);
+		//std::lock_guard lock(m_storage_lock);
 
 		const auto num_writes = ::size32(m_pending_writes);
 		const auto num_copies = ::size32(m_pending_copies);