diff --git a/.github/workflows/rolling-release.yml b/.github/workflows/rolling-release.yml
index fc2d804c0..e63fddaba 100644
--- a/.github/workflows/rolling-release.yml
+++ b/.github/workflows/rolling-release.yml
@@ -10,8 +10,9 @@ jobs:
   windows-build:
     runs-on: windows-2019
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2.3.1
       with:
+        fetch-depth: 0
         submodules: true
 
     - name: Compile release build
@@ -56,7 +57,9 @@ jobs:
   linux-build:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2.3.1
+      with:
+        fetch-depth: 0
 
     - name: Install packages
       shell: bash
diff --git a/README.md b/README.md
index 4fff36585..0efad7aa1 100644
--- a/README.md
+++ b/README.md
@@ -95,6 +95,10 @@ Alternatively, the region checking can be disabled in the console options tab. T
 
 Mismatching the disc and console regions with the check disabled is supported, but may break games if they are patching the BIOS and expecting specific content.
 
+### LibCrypt protection and SBI files
+
+A number of PAL region games use LibCrypt protection, requiring additional CD subchannel information to run properly. For these games, make sure that the CD image and its corresponding SBI (.sbi) file have the same name and are placed in the same directory. DuckStation will automatically load the SBI file when it is found next to the CD image.
+
 ## Building
 
 ### Windows
diff --git a/src/frontend-common/sdl_controller_interface.cpp b/src/frontend-common/sdl_controller_interface.cpp
index a2c54ed52..fab613b22 100644
--- a/src/frontend-common/sdl_controller_interface.cpp
+++ b/src/frontend-common/sdl_controller_interface.cpp
@@ -319,7 +319,7 @@ bool SDLControllerInterface::HandleControllerButtonEvent(const SDL_Event* ev)
   Log_DebugPrintf("controller %d button %d %s", ev->cbutton.which, ev->cbutton.button,
                   ev->cbutton.state == SDL_PRESSED ? "pressed" : "released");
 
-  auto it = GetControllerDataForJoystickId(ev->caxis.which);
+  auto it = GetControllerDataForJoystickId(ev->cbutton.which);
   if (it == m_controllers.end())
     return false;