diff --git a/.github/workflows/compile-examples.yml b/.github/workflows/compile-examples.yml
index 313c270e..57c98f42 100644
--- a/.github/workflows/compile-examples.yml
+++ b/.github/workflows/compile-examples.yml
@@ -87,7 +87,8 @@ jobs:
       - name: Checkout ArduinoCore-API
         uses: actions/checkout@v2
         with:
-          repository: arduino/ArduinoCore-API
+          repository: giulcioffi/ArduinoCore-API
+          ref: FmacroIssue
           path: extras/ArduinoCore-API
 
       - name: Install ArduinoCore-API
@@ -107,8 +108,9 @@ jobs:
           rm -r "$GITHUB_WORKSPACE/extras/examples/10.StarterKit_BasicKit/p11_CrystalBall"
           # CapacitiveSensor library does not support megaAVR core yet
           rm -r "$GITHUB_WORKSPACE/extras/examples/10.StarterKit_BasicKit/p13_TouchSensorLamp"
+
       - name: Compile examples
-        uses: arduino/actions/libraries/compile-examples@master
+        uses: giulcioffi/compile-sketches@CheckAgainstDatabase
         with:
           fqbn: ${{ matrix.board.fqbn }}
           libraries: |
@@ -143,10 +145,11 @@ jobs:
             ${{ env.UNIVERSAL_SKETCH_PATHS }}
             ${{ matrix.additional-sketch-paths }}
           enable-deltas-report: 'true'
+          allow-failures: 'true'
           verbose: 'true'
 
       - name: Save memory usage change report as artifact
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v2
         with:
-          name: size-deltas-reports
-          path: size-deltas-reports
\ No newline at end of file
+          name: sketches-reports
+          path: sketches-reports
\ No newline at end of file
diff --git a/cores/arduino/Arduino.h b/cores/arduino/Arduino.h
index 83017230..ed21105d 100644
--- a/cores/arduino/Arduino.h
+++ b/cores/arduino/Arduino.h
@@ -22,13 +22,9 @@
 
 #include "api/ArduinoAPI.h"
 
-#include <avr/pgmspace.h>
 #include <avr/io.h>
 #include <avr/interrupt.h>
 
-#undef F
-#define F(str) (str)
-
 #ifdef __cplusplus
 extern "C"{
 #endif