diff --git a/fido2/extensions/extensions.c b/fido2/extensions/extensions.c
index d14cab8..f8160df 100644
--- a/fido2/extensions/extensions.c
+++ b/fido2/extensions/extensions.c
@@ -91,10 +91,10 @@ int16_t extend_fido2(CredentialId * credid, uint8_t * output)
     }
 }
 
-int16_t extend_u2f(struct u2f_request_apdu* req, uint32_t len)
+int16_t extend_u2f(APDU_HEADER * req, uint8_t * payload, uint32_t len)
 {
 
-    struct u2f_authenticate_request * auth = (struct u2f_authenticate_request *) req->payload;
+    struct u2f_authenticate_request * auth = (struct u2f_authenticate_request *) payload;
     uint16_t rcode;
 
     if (req->ins == U2F_AUTHENTICATE)
diff --git a/fido2/extensions/extensions.h b/fido2/extensions/extensions.h
index ea871a5..2d602c1 100644
--- a/fido2/extensions/extensions.h
+++ b/fido2/extensions/extensions.h
@@ -7,8 +7,9 @@
 #ifndef EXTENSIONS_H_
 #define EXTENSIONS_H_
 #include "u2f.h"
+#include "apdu.h"
 
-int16_t extend_u2f(struct u2f_request_apdu* req, uint32_t len);
+int16_t extend_u2f(APDU_HEADER * req, uint8_t * payload, uint32_t len);
 
 int16_t extend_fido2(CredentialId * credid, uint8_t * output);
 
diff --git a/fido2/u2f.c b/fido2/u2f.c
index 9b2d766..3e968a8 100644
--- a/fido2/u2f.c
+++ b/fido2/u2f.c
@@ -43,7 +43,7 @@ void u2f_request_ex(APDU_HEADER *req, uint8_t *payload, uint32_t len, CTAP_RESPO
         goto end;
     }
 #ifdef ENABLE_U2F_EXTENSIONS
-    rcode = extend_u2f(req, len);   // FIXME
+    rcode = extend_u2f(req, payload, len);
 #endif
     if (rcode != U2F_SW_NO_ERROR && rcode != U2F_SW_CONDITIONS_NOT_SATISFIED)       // If the extension didn't do anything...
     {
diff --git a/targets/stm32l432/bootloader/main.c b/targets/stm32l432/bootloader/main.c
index aec4d61..ef057ed 100644
--- a/targets/stm32l432/bootloader/main.c
+++ b/targets/stm32l432/bootloader/main.c
@@ -27,7 +27,7 @@
 uint8_t REBOOT_FLAG = 0;
 
 
-void  BOOT_boot(void)
+void BOOT_boot(void)
 {
   typedef void (*pFunction)(void);
 
@@ -79,7 +79,7 @@ int main()
     init_millisecond_timer(1);
 
 #if DEBUG_LEVEL > 0
-        init_debug_uart();
+    init_debug_uart();
 #endif
 
     printf1(TAG_GEN,"init device\n");
@@ -118,7 +118,7 @@ int main()
     }
 #ifdef SOLO_HACKER
     start_bootloader:
-
+#endif
     SystemClock_Config();
     init_gpio();
     init_millisecond_timer(0);