diff --git a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp b/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp
index 9e4c58621..b65cbdf46 100644
--- a/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp
+++ b/src/shader_recompiler/backend/spirv/spirv_emit_context.cpp
@@ -42,7 +42,7 @@ void Name(EmitContext& ctx, Id object, std::string_view format_str, Args&&... ar
 } // Anonymous namespace
 
 EmitContext::EmitContext(const Profile& profile_, const RuntimeInfo& runtime_info_,
-                         const Shader::Info& info_, u32& binding_)
+                         const Info& info_, u32& binding_)
     : Sirit::Module(profile_.supported_spirv), info{info_}, runtime_info{runtime_info_},
       profile{profile_}, stage{info.stage}, binding{binding_} {
     AddCapability(spv::Capability::Shader);
@@ -169,7 +169,7 @@ EmitContext::SpirvAttribute EmitContext::GetAttributeInfo(AmdGpu::NumberFormat f
 void EmitContext::DefineBufferOffsets() {
     for (auto& buffer : buffers) {
         const u32 binding = buffer.binding;
-        const u32 half = Shader::PushData::BufOffsetIndex + (binding >> 4);
+        const u32 half = PushData::BufOffsetIndex + (binding >> 4);
         const u32 comp = (binding & 0xf) >> 2;
         const u32 offset = (binding & 0x3) << 3;
         const Id ptr{OpAccessChain(TypePointer(spv::StorageClass::PushConstant, U32[1]),
@@ -180,7 +180,7 @@ void EmitContext::DefineBufferOffsets() {
     }
     for (auto& tex_buffer : texture_buffers) {
         const u32 binding = tex_buffer.binding;
-        const u32 half = Shader::PushData::BufOffsetIndex + (binding >> 4);
+        const u32 half = PushData::BufOffsetIndex + (binding >> 4);
         const u32 comp = (binding & 0xf) >> 2;
         const u32 offset = (binding & 0x3) << 3;
         const Id ptr{OpAccessChain(TypePointer(spv::StorageClass::PushConstant, U32[1]),
diff --git a/src/shader_recompiler/backend/spirv/spirv_emit_context.h b/src/shader_recompiler/backend/spirv/spirv_emit_context.h
index 782343f22..0908b7f82 100644
--- a/src/shader_recompiler/backend/spirv/spirv_emit_context.h
+++ b/src/shader_recompiler/backend/spirv/spirv_emit_context.h
@@ -36,8 +36,8 @@ struct VectorIds {
 
 class EmitContext final : public Sirit::Module {
 public:
-    explicit EmitContext(const Profile& profile, const RuntimeInfo& runtime_info,
-                         const Shader::Info& info, u32& binding);
+    explicit EmitContext(const Profile& profile, const RuntimeInfo& runtime_info, const Info& info,
+                         u32& binding);
     ~EmitContext();
 
     Id Def(const IR::Value& value);
diff --git a/src/shader_recompiler/runtime_info.h b/src/shader_recompiler/runtime_info.h
index 92b205360..37fd64bb1 100644
--- a/src/shader_recompiler/runtime_info.h
+++ b/src/shader_recompiler/runtime_info.h
@@ -113,14 +113,16 @@ struct RuntimeInfo {
     RuntimeInfo(Stage stage_) : stage{stage_} {}
 
     bool operator==(const RuntimeInfo& other) const noexcept {
-        if (stage == Stage::Fragment) {
+        switch (stage) {
+        case Stage::Fragment:
             return fs_info == other.fs_info;
-        } else if (stage == Stage::Vertex) {
+        case Stage::Vertex:
             return vs_info == other.vs_info;
-        } else if (stage == Stage::Compute) {
+        case Stage::Compute:
             return cs_info == other.cs_info;
+        default:
+            return true;
         }
-        UNREACHABLE();
     }
 };
 
diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
index b7c70f4b9..364c2b4f1 100644
--- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
+++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp
@@ -106,7 +106,7 @@ Shader::RuntimeInfo BuildRuntimeInfo(Shader::Stage stage, const GraphicsPipeline
         break;
     }
     default:
-        UNREACHABLE();
+        break;
     }
     return info;
 }