diff --git a/examples/nfc-sam.c b/examples/nfc-sam.c
index 8976b58..547d6da 100644
--- a/examples/nfc-sam.c
+++ b/examples/nfc-sam.c
@@ -45,6 +45,7 @@
 #include <nfc/nfc.h>
 #include <nfc/nfc-messages.h>
 #include "nfc-utils.h"
+// FIXME: Remove me
 #include "chips/pn53x.h"
 
 #define MAX_FRAME_LEN 264
@@ -81,6 +82,7 @@ bool sam_connection(nfc_device_t* pnd, int mode)
     break;
   }
   
+  // FIXME: Direct call
   if (!pn53x_transceive(pnd,pncmd_sam_config,szCmd,abtRx,&szRxLen)) {
     ERR("%s %d", "Unable to execute SAMConfiguration command with mode byte:", mode);
     return false;
diff --git a/examples/pn53x-diagnose.c b/examples/pn53x-diagnose.c
index f3fc0d6..462204c 100644
--- a/examples/pn53x-diagnose.c
+++ b/examples/pn53x-diagnose.c
@@ -29,6 +29,7 @@
 #include <nfc/nfc-messages.h>
 
 #include "nfc-utils.h"
+// FIXME: Delete me
 #include "chips/pn53x.h"
 
 #define MAX_DEVICE_COUNT 16
@@ -78,18 +79,21 @@ int main(int argc, const char* argv[])
 
     printf("NFC device [%s] connected.\n",pnd->acName);
 
+    // FIXME: Direct call
     result = pn53x_transceive(pnd,pncmd_diagnose_communication_line_test,sizeof(pncmd_diagnose_communication_line_test),abtRx,&szRxLen);
     if ( result ) {
       result = (memcmp(pncmd_diagnose_communication_line_test+2, abtRx, sizeof(pncmd_diagnose_communication_line_test)-2 ) == 0);
     }
     printf(" Communication line test: %s\n", result ? "OK" : "Failed");
 
+    // FIXME: Direct call
     result = pn53x_transceive(pnd,pncmd_diagnose_rom_test,sizeof(pncmd_diagnose_rom_test),abtRx,&szRxLen);
     if ( result ) {
       result = ((szRxLen == 1) && (abtRx[0] == 0x00));
     }
     printf(" ROM test: %s\n", result ? "OK" : "Failed");
 
+    // FIXME: Direct call
     result = pn53x_transceive(pnd,pncmd_diagnose_ram_test,sizeof(pncmd_diagnose_ram_test),abtRx,&szRxLen);
     if ( result ) {
       result = ((szRxLen == 1) && (abtRx[0] == 0x00));