diff --git a/cores/arduino/SERCOM.cpp b/cores/arduino/SERCOM.cpp
index f5337d604967a5042487a275a6ec158a245eab34..9a53c04129ada8e697c0d6bbd3f66ccbb0090250 100644
--- a/cores/arduino/SERCOM.cpp
+++ b/cores/arduino/SERCOM.cpp
@@ -633,7 +633,7 @@ void SERCOM::initClockNVIC( void )
 		clockId = GCM_SERCOM4_CORE;
 		IdNvic = SERCOM4_IRQn;
 	}
-	else if(sercom == SERCOM5)
+	else // if(sercom == SERCOM5)
 	{
 		clockId = GCM_SERCOM5_CORE;
 		IdNvic = SERCOM5_IRQn;
diff --git a/cores/arduino/USB/USBCore.cpp b/cores/arduino/USB/USBCore.cpp
index 455b271d9d6507364baa34085e90a371bdd9e0a5..41285d4f056afc97a551a414a9402cd906dbdf5a 100644
--- a/cores/arduino/USB/USBCore.cpp
+++ b/cores/arduino/USB/USBCore.cpp
@@ -105,7 +105,7 @@ uint32_t USBD_Available(uint32_t ep)
 //	Return number of bytes read
 uint32_t USBD_Recv(uint32_t ep, void* d, uint32_t len)
 {
-	if (!_usbConfiguration || len < 0)
+	if (!_usbConfiguration)
 		return -1;
 
 	uint32_t n = UDD_FifoByteCount(ep);
@@ -200,8 +200,8 @@ uint32_t USBD_RecvControl(void* d, uint32_t len)
 	if (read > len)
 		read = len;
 	UDD_Recv(EP0, &buffer);
-	while (!udd_is_OUT_transf_cplt(EP0));
-	for (int i=0; i<read; i++) {
+	while (!udd_is_OUT_transf_cplt(EP0));
+	for (uint32_t i=0; i<read; i++) {
 		data[i] = buffer[i];
 	}
 	udd_OUT_transfer_allowed(EP0);