diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
index c0d72f31..e8ffa2b8 100644
--- a/.github/workflows/changelog.yml
+++ b/.github/workflows/changelog.yml
@@ -1,5 +1,9 @@
 on:
-  pull_request_target:
+  pull_request:
+    # Run on labeled/unlabeled in addition to defaults to detect
+    # adding/removing skip-changelog labels.
+    types: [opened, reopened, labeled, unlabeled, synchronize]
+  merge_group:
 
 name: Changelog check
 
@@ -9,11 +13,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
-      - name: Changelog updated
-        uses: Zomzog/changelog-checker@v1.2.0
+      - name: Check changelog update
+        uses: dangoslen/changelog-enforcer@v3
         with:
-          fileName: CHANGELOG.md
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          skipLabels: skip-changelog
+          missingUpdateErrorMessage: "Please add a changelog entry to the appropriate section of the CHANGELOG.md file."
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 034cde6f..9f354117 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,6 +1,6 @@
 on:
   push:
-    branches: master
+    branches: [master]
   pull_request:
   merge_group:
 
@@ -34,7 +34,7 @@ jobs:
             experimental: true
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Use the latest ${{ matrix.rust }} rustc
         run: rustup update ${{ matrix.rust }} && rustup default ${{ matrix.rust }}
       - name: Add Cortex-M3 target
diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml
index 35c2ea1c..500ca2dc 100644
--- a/.github/workflows/clippy.yml
+++ b/.github/workflows/clippy.yml
@@ -1,6 +1,6 @@
 on:
   push:
-    branches: master
+    branches: [master]
   pull_request:
 
 name: Clippy check
@@ -8,7 +8,7 @@ jobs:
   clippy_check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Use the latest stable rustc
         run: rustup update stable && rustup default stable
       - name: Add Cortex-M3 target
diff --git a/.github/workflows/rustfmt.yml b/.github/workflows/rustfmt.yml
index 8b6ecab3..42c4d824 100644
--- a/.github/workflows/rustfmt.yml
+++ b/.github/workflows/rustfmt.yml
@@ -1,6 +1,6 @@
 on:
   push:
-    branches: master
+    branches: [master]
   pull_request:
   merge_group:
 
@@ -11,7 +11,7 @@ jobs:
     name: Rustfmt
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Use the latest stable rustc
         run: rustup update stable && rustup default stable
 
diff --git a/src/i2c/blocking.rs b/src/i2c/blocking.rs
index 84de01ae..75ac9869 100644
--- a/src/i2c/blocking.rs
+++ b/src/i2c/blocking.rs
@@ -334,6 +334,8 @@ pub trait BlockingI2cExt: I2cExt {
     }
 }
 
+impl<I2C: I2cExt> BlockingI2cExt for I2C {}
+
 impl<I2C: Instance, const R: u8> Rmp<I2C, R> {
     #[allow(clippy::too_many_arguments)]
     pub fn blocking_i2c(