diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/ProtobufParameterBuilderFingerprint.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/ProtobufParameterBuilderFingerprint.kt
index a9e58174..3b61b09d 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/ProtobufParameterBuilderFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/fingerprints/ProtobufParameterBuilderFingerprint.kt
@@ -5,27 +5,9 @@ import org.jf.dexlib2.Opcode
 
 object ProtobufParameterBuilderFingerprint : MethodFingerprint(
     opcodes = listOf(
-        Opcode.MOVE_RESULT,
-        Opcode.CONST_16,
-        Opcode.MOVE_FROM16,
-        Opcode.MOVE_OBJECT_FROM16,
-        Opcode.MOVE_OBJECT_FROM16,
-        Opcode.MOVE_OBJECT,
-        Opcode.MOVE_FROM16,
-        Opcode.MOVE_OBJECT_FROM16,
-        Opcode.MOVE_FROM16,
-        Opcode.MOVE_OBJECT_FROM16,
-        Opcode.MOVE_OBJECT_FROM16,
-        Opcode.MOVE_OBJECT_FROM16,
-        Opcode.MOVE_FROM16,
-        Opcode.MOVE_FROM16,
-        Opcode.MOVE_FROM16,
-        Opcode.INVOKE_VIRTUAL_RANGE, // target reference
-//        Opcode.MOVE_RESULT_OBJECT,
-//        Opcode.IPUT_OBJECT
+        Opcode.INVOKE_VIRTUAL_RANGE,
+        Opcode.MOVE_RESULT_OBJECT,
+        Opcode.IPUT_OBJECT
     ),
-    strings = listOf(
-        "Prefetch request are disabled.",
-        "Unexpected empty videoId.",
-    )
+    strings = listOf("Unexpected empty videoId.", "Prefetch request are disabled.")
 )
\ No newline at end of file
diff --git a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/patch/SpoofSignatureVerificationPatch.kt b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/patch/SpoofSignatureVerificationPatch.kt
index f8fce33b..7fdc5f16 100644
--- a/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/patch/SpoofSignatureVerificationPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/youtube/misc/fix/playback/patch/SpoofSignatureVerificationPatch.kt
@@ -29,7 +29,7 @@ class SpoofSignatureVerificationPatch : BytecodePatch(
         ProtobufParameterBuilderFingerprint.result?.let {
             val setParamMethod = context
                 .toMethodWalker(it.method)
-                .nextMethod(it.scanResult.patternScanResult!!.endIndex, true).getMethod() as MutableMethod
+                    .nextMethod(it.scanResult.patternScanResult!!.startIndex, true).getMethod() as MutableMethod
 
             setParamMethod.apply {
                 val protobufParameterRegister = 3