diff --git a/src/xenia/gpu/dxbc_shader_translator.cc b/src/xenia/gpu/dxbc_shader_translator.cc
index aa3ffa6de..196aef92e 100644
--- a/src/xenia/gpu/dxbc_shader_translator.cc
+++ b/src/xenia/gpu/dxbc_shader_translator.cc
@@ -36,7 +36,23 @@ void DxbcShaderTranslator::Reset() {
   std::memset(&stat_, 0, sizeof(stat_));
 }
 
+void DxbcShaderTranslator::EmitRet() {
+  const uint32_t opcode = ENCODE_D3D10_SB_OPCODE_TYPE(D3D10_SB_OPCODE_RET) |
+                          ENCODE_D3D10_SB_TOKENIZED_INSTRUCTION_LENGTH(1);
+  shader_code_.push_back(opcode);
+  ++stat_.instruction_count;
+  ++stat_.static_flow_control_count;
+}
+
+void DxbcShaderTranslator::CompleteShaderCode() {
+  // Return from `main`.
+  EmitRet();
+}
+
 std::vector<uint8_t> DxbcShaderTranslator::CompleteTranslation() {
+  // Write the code epilogue.
+  CompleteShaderCode();
+
   shader_object_.clear();
 
   // Write the shader object header.
@@ -187,7 +203,7 @@ const DxbcShaderTranslator::RdefConstant
 
         {"xe_fetch_constants", RdefTypeIndex::kUint4Array48, 0, 768},
 
-        {"xe_float_constants", RdefTypeIndex::kFloatConstantPageArray, 0,
+        {"xe_float_constants", RdefTypeIndex::kFloatConstantPageStruct, 0,
          kFloatConstantsPerPage * 16},
 };
 
@@ -502,7 +518,7 @@ void DxbcShaderTranslator::WriteOutputSignature() {
 
   if (is_vertex_shader()) {
     // Interpolators, point parameters (coordinates, size), screen position.
-    shader_object_.push_back(1);
+    shader_object_.push_back(kInterpolatorCount + 2);
     // Unknown.
     shader_object_.push_back(8);
 
diff --git a/src/xenia/gpu/dxbc_shader_translator.h b/src/xenia/gpu/dxbc_shader_translator.h
index e6c626650..c830e3b15 100644
--- a/src/xenia/gpu/dxbc_shader_translator.h
+++ b/src/xenia/gpu/dxbc_shader_translator.h
@@ -95,6 +95,11 @@ class DxbcShaderTranslator : public ShaderTranslator {
   static constexpr uint32_t kPSInPositionRegister =
       kPSInPointParametersRegister + 1;
 
+  void EmitRet();
+
+  // Writes the epilogue.
+  void CompleteShaderCode();
+
   // Appends a string to a DWORD stream, returns the DWORD-aligned length.
   static uint32_t AppendString(std::vector<uint32_t>& dest, const char* source);