diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index 61aab8ea2..d0cbe6f09 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -13,7 +13,7 @@ jobs:
         config-options:
           - "--soc=BCM2835 --driver=RPi"
           - "--soc=BCM2836 --driver=RPi"
-          - "--soc=BCM2835 --driver=wiringPi --extra-cflags=-I/usr/local/include"
+          # - "--soc=BCM2835 --driver=wiringPi --extra-cflags=-I/usr/local/include"
           - "--driver=SPIDEV"
 
     steps:
@@ -28,7 +28,7 @@ jobs:
       - name: provide WiringPi
         if: ${{ matrix.config-options == '--soc=BCM2835 --driver=wiringPi --extra-cflags=-I/usr/local/include' }}
         run: |
-          git clone https://github.com/CoRfr/WiringPi
+          git clone https://github.com/WiringPi/WiringPi
           cd WiringPi/wiringPi
           CC="arm-linux-gnueabihf-gcc -marm -mtune=arm1176jzf-s -mfpu=vfp -mfloat-abi=hard" V=1 make -j5
           sudo make install
diff --git a/RF24.cpp b/RF24.cpp
index 470570a86..a09df222c 100644
--- a/RF24.cpp
+++ b/RF24.cpp
@@ -754,7 +754,7 @@ bool RF24::begin(void)
     write_register(DYNPD, 0);         // disable dynamic payloads by default (for all pipes)
     dynamic_payloads_enabled = false;
     write_register(EN_AA, 0x3F);      // enable auto-ack on all pipes
-    write_register(EN_RXADDR, 0);     // close all RX pipes
+    write_register(EN_RXADDR, 3);     // only open RX pipes 0 & 1
     setPayloadSize(32);               // set static payload size to 32 (max) bytes by default
     setAddressWidth(5);               // set default address length to (max) 5 bytes
 
@@ -1354,8 +1354,8 @@ void RF24::enableAckPayload(void)
 
         IF_SERIAL_DEBUG(printf("FEATURE=%i\r\n", read_register(FEATURE)));
 
-        // Enable dynamic payload on pipes 0
-        write_register(DYNPD, read_register(DYNPD) | _BV(DPL_P0));
+        // Enable dynamic payload on pipes 0 & 1
+        write_register(DYNPD, read_register(DYNPD) | _BV(DPL_P1) | _BV(DPL_P0));
         dynamic_payloads_enabled = true;
         ack_payloads_enabled = true;
     }