diff --git a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu.h b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu.h
index 87ac0605..2a446023 100644
--- a/firmware/atmel_softpack_libraries/usb/device/dfu/dfu.h
+++ b/firmware/atmel_softpack_libraries/usb/device/dfu/dfu.h
@@ -78,8 +78,8 @@ extern const USBDDriverDescriptors dfu_descriptors;
 
 /* no DFU bootloader is being used */
 #define DFURT_NUM_IF	0
-#define DFURT_IF_DESCRIPTOR_STRUCT(a, b)
-#define DFURT_IF_DESCRIPTOR
+#define DFURT_IF_DESCRIPTOR_STRUCT
+#define DFURT_IF_DESCRIPTOR(a, b)
 
 #endif /* BOARD_USB_DFU */
 
diff --git a/firmware/libcommon/include/llist_irqsafe.h b/firmware/libcommon/include/llist_irqsafe.h
index 5ead1ec9..369b026b 100644
--- a/firmware/libcommon/include/llist_irqsafe.h
+++ b/firmware/libcommon/include/llist_irqsafe.h
@@ -10,7 +10,7 @@ static inline void llist_add_irqsafe(struct llist_head *_new,
 
 	local_irq_save(x);
 	llist_add(_new, head);
-	local_irq_retsore(x);
+	local_irq_restore(x);
 }
 
 static inline void llist_add_tail_irqsafe(struct llist_head *_new,
diff --git a/firmware/libcommon/source/usb.c b/firmware/libcommon/source/usb.c
index 61cefd2b..bb77361b 100644
--- a/firmware/libcommon/source/usb.c
+++ b/firmware/libcommon/source/usb.c
@@ -268,7 +268,7 @@ static const SIMTraceDriverConfigurationDescriptorPhone
 #ifdef CARDEMU_SECOND_UART
 		.bNumInterfaces		= 2+DFURT_NUM_IF,
 #else
-		.bNumInterefaces	= 1+DFURT_NUM_IF,
+		.bNumInterfaces		= 1+DFURT_NUM_IF,
 #endif
 		.bConfigurationValue	= CFG_NUM_PHONE,
 		.iConfiguration		= PHONE_CONF_STR,
@@ -506,7 +506,7 @@ static const SIMTraceDriverConfigurationDescriptorMITM
 		.bAlternateSetting	= 0,
 		.bNumEndpoints		= 3,
 		.bInterfaceClass	= 0xff,
-		.bInterfaceSubClass	= SIMTRAC_SUBCLASS_CARDEM,
+		.bInterfaceSubClass	= SIMTRACE_SUBCLASS_CARDEM,
 		.bInterfaceProtocol	= 0,
 		.iInterface		= PHONE_CONF_STR,
 	},