diff --git a/renderdoc/driver/shaders/spirv/spirv_debug_glsl450.cpp b/renderdoc/driver/shaders/spirv/spirv_debug_glsl450.cpp
index d21b6d7e6..46df06f98 100644
--- a/renderdoc/driver/shaders/spirv/spirv_debug_glsl450.cpp
+++ b/renderdoc/driver/shaders/spirv/spirv_debug_glsl450.cpp
@@ -775,7 +775,7 @@ ShaderVariable FaceForward(ThreadState &state, uint32_t, const rdcarray<Id> &par
 
   ShaderVariable N = state.GetSrc(params[0]);
   ShaderVariable I = state.GetSrc(params[1]);
-  ShaderVariable Nref = state.GetSrc(params[1]);
+  ShaderVariable Nref = state.GetSrc(params[2]);
 
   float dot = 0;
   for(uint8_t c = 0; c < Nref.columns; c++)
diff --git a/renderdoc/driver/shaders/spirv/spirv_debug_setup.cpp b/renderdoc/driver/shaders/spirv/spirv_debug_setup.cpp
index 44e33b0c6..08e742f06 100644
--- a/renderdoc/driver/shaders/spirv/spirv_debug_setup.cpp
+++ b/renderdoc/driver/shaders/spirv/spirv_debug_setup.cpp
@@ -65,7 +65,7 @@ static void ClampScalars(rdcspv::DebugAPIWrapper *apiWrapper, const ShaderVariab
     apiWrapper->AddDebugMessage(
         MessageCategory::Execution, MessageSeverity::High, MessageSource::RuntimeWarning,
         StringFormat::Fmt("Invalid scalar index %u at matrix %s with %u rows. Clamping to %u",
-                          scalar0, var.rows, var.name.c_str(), var.rows - 1));
+                          scalar1, var.rows, var.name.c_str(), var.rows - 1));
     scalar1 = var.rows - 1;
   }
 }
@@ -1847,7 +1847,7 @@ void Debugger::CalcActiveMask(rdcarray<bool> &activeMask)
     // if we've newly diverged, all workgroups should have the same merge block - the point where we
     // become uniform again.
     convergeBlock = workgroup[0].mergeBlock;
-    for(size_t i = 1; !diverged && i < workgroup.size(); i++)
+    for(size_t i = 1; i < workgroup.size(); i++)
       RDCASSERT(convergeBlock == workgroup[i].mergeBlock);
   }