diff --git a/source/common/engine/namedef.h b/source/common/engine/namedef.h
index 7d7cff000..9e20b35c2 100644
--- a/source/common/engine/namedef.h
+++ b/source/common/engine/namedef.h
@@ -810,6 +810,7 @@ xx(MoveBob)
 xx(StillBob)
 xx(ClassicFlight)
 xx(WBobSpeed)
+xx(WBobFire)
 xx(PlayerClass)
 xx(MonsterClass)
 xx(MorphedMonster)
diff --git a/source/common/platform/win32/win32basevideo.cpp b/source/common/platform/win32/win32basevideo.cpp
index fe2ba3b9a..de149ae9b 100644
--- a/source/common/platform/win32/win32basevideo.cpp
+++ b/source/common/platform/win32/win32basevideo.cpp
@@ -33,10 +33,7 @@
 */
 
 #include <windows.h>
-#include <GL/gl.h>
-#include "wglext.h"
 
-#include "gl_sysfb.h"
 #include "hardware.h"
 #include "x86.h"
 #include "templates.h"
@@ -52,8 +49,6 @@
 #include "win32basevideo.h"
 #include "cmdlib.h"
 
-#include "gl_framebuffer.h"
-
 CVAR(Int, vid_adapter, 1, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 
 //==========================================================================
diff --git a/source/common/rendering/vulkan/textures/vk_hwtexture.cpp b/source/common/rendering/vulkan/textures/vk_hwtexture.cpp
index 0a30a76e4..aac018518 100644
--- a/source/common/rendering/vulkan/textures/vk_hwtexture.cpp
+++ b/source/common/rendering/vulkan/textures/vk_hwtexture.cpp
@@ -390,8 +390,8 @@ VulkanDescriptorSet* VkMaterial::GetDescriptorSet(const FMaterialState& state)
 
 	WriteDescriptors update;
 	MaterialLayerInfo *layer;
-	auto systex = static_cast<VkHardwareTexture*>(GetLayer(0, translation, &layer));
-	update.addCombinedImageSampler(descriptor.get(), 0, systex->GetImage(layer->layerTexture, translation, layer->scaleFlags)->View.get(), sampler, systex->mImage.Layout);
+	auto systex = static_cast<VkHardwareTexture*>(GetLayer(0, state.mTranslation, &layer));
+	update.addCombinedImageSampler(descriptor.get(), 0, systex->GetImage(layer->layerTexture, state.mTranslation, layer->scaleFlags)->View.get(), sampler, systex->mImage.Layout);
 	for (int i = 1; i < numLayers; i++)
 	{
 		auto systex = static_cast<VkHardwareTexture*>(GetLayer(i, 0, &layer));