diff --git a/lib/lufa/LUFA/Drivers/USB/Class/Common/HIDParser.c b/lib/lufa/LUFA/Drivers/USB/Class/Common/HIDParser.c
index 62f10c4e22..9250cad33a 100644
--- a/lib/lufa/LUFA/Drivers/USB/Class/Common/HIDParser.c
+++ b/lib/lufa/LUFA/Drivers/USB/Class/Common/HIDParser.c
@@ -90,7 +90,7 @@ uint8_t USB_ProcessHIDReport(const uint8_t* ReportData,
 				if (CurrStateTable == &StateTable[HID_STATETABLE_STACK_DEPTH - 1])
 				  return HID_PARSE_HIDStackOverflow;
 
-				memcpy((CurrStateTable + 1),
+				memmove(CurrStateTable + 1,
 				       CurrStateTable,
 				       sizeof(HID_ReportItem_t));
 
diff --git a/lib/lufa/LUFA/Drivers/USB/Core/Events.h b/lib/lufa/LUFA/Drivers/USB/Core/Events.h
index 57fd0d9af7..91fb31b620 100644
--- a/lib/lufa/LUFA/Drivers/USB/Core/Events.h
+++ b/lib/lufa/LUFA/Drivers/USB/Core/Events.h
@@ -331,7 +331,7 @@
 	#if !defined(__DOXYGEN__)
 		/* Function Prototypes: */
 			#if defined(__INCLUDE_FROM_EVENTS_C)
-				void USB_Event_Stub(void) ATTR_CONST;
+				void USB_Event_Stub(void);
 
 				#if defined(USB_CAN_BE_BOTH)
 					void EVENT_USB_UIDChange(void) ATTR_WEAK ATTR_ALIAS(USB_Event_Stub);