Fix some ARM builds due to HID brokenness