diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/core/USBD.c b/sam3s_example/atmel_softpack_libraries/usb/device/core/USBD.c
index b0d155f..cdd668f 100644
--- a/sam3s_example/atmel_softpack_libraries/usb/device/core/USBD.c
+++ b/sam3s_example/atmel_softpack_libraries/usb/device/core/USBD.c
@@ -143,6 +143,7 @@
 void USBD_RequestHandler(uint8_t bEndpoint,
                          const USBGenericRequest* pRequest)
 {
+    TRACE_DEBUG("%s\n\r", "USBD_RequestHandler");
     if (bEndpoint != 0) {
         TRACE_WARNING("EP%d request not supported, default EP only",
                       bEndpoint);
@@ -366,6 +367,7 @@
     /* Upper Layer Initialize */
     if (USBDCallbacks_Initialized)
         USBDCallbacks_Initialized();
+    TRACE_DEBUG("%s\n\r", "..");
 }
 
 /**
diff --git a/sam3s_example/atmel_softpack_libraries/usb/device/core/USBDDriver.c b/sam3s_example/atmel_softpack_libraries/usb/device/core/USBDDriver.c
index 689ae1f..0231501 100644
--- a/sam3s_example/atmel_softpack_libraries/usb/device/core/USBDDriver.c
+++ b/sam3s_example/atmel_softpack_libraries/usb/device/core/USBDDriver.c
@@ -36,6 +36,8 @@
  *      Headers
  *------------------------------------------------------------------------------*/
 
+#include <board.h>
+
 #include <USBLib_Trace.h>
 
 #include "USBDDriver.h"
@@ -82,6 +84,7 @@
     const USBConfigurationDescriptor *pConfiguration;
 
     /* Use different descriptor depending on device speed */
+    TRACE_DEBUG("%s\n\r", "SetConfiguration");
 
     if (USBD_IsHighSpeed()) {
 
@@ -229,7 +232,7 @@
 
     if (USBD_IsHighSpeed()) {
 
-        TRACE_DEBUG("HS ");
+        TRACE_DEBUG("%s", "HS ");
         pDevice = pDriver->pDescriptors->pHsDevice;
         pConfiguration = pDriver->pDescriptors->pHsConfiguration;
         pQualifier = pDriver->pDescriptors->pHsQualifier;
@@ -237,7 +240,7 @@
     }
     else {
 
-        TRACE_DEBUG("FS ");
+        TRACE_DEBUG("%s", "FS ");
         pDevice = pDriver->pDescriptors->pFsDevice;
         pConfiguration = pDriver->pDescriptors->pFsConfiguration;
         pQualifier = pDriver->pDescriptors->pFsQualifier;