diff --git a/firmware/hw_layer/serial_over_usb/usbcfg.c b/firmware/hw_layer/serial_over_usb/usbcfg.c
index bb9947854b..efbf374605 100644
--- a/firmware/hw_layer/serial_over_usb/usbcfg.c
+++ b/firmware/hw_layer/serial_over_usb/usbcfg.c
@@ -1,5 +1,5 @@
 /*
-    ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio
+    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -269,8 +269,6 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
   extern SerialUSBDriver SDU1;
 
   switch (event) {
-  case USB_EVENT_RESET:
-    return;
   case USB_EVENT_ADDRESS:
     return;
   case USB_EVENT_CONFIGURED:
@@ -287,8 +285,10 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
 
     chSysUnlockFromISR();
     return;
+  case USB_EVENT_RESET:
+    /* Falls into.*/
   case USB_EVENT_UNCONFIGURED:
-    return;
+    /* Falls into.*/
   case USB_EVENT_SUSPEND:
     chSysLockFromISR();
 
diff --git a/firmware/hw_layer/serial_over_usb/usbcfg.h b/firmware/hw_layer/serial_over_usb/usbcfg.h
index 1c402e3967..b62a028798 100644
--- a/firmware/hw_layer/serial_over_usb/usbcfg.h
+++ b/firmware/hw_layer/serial_over_usb/usbcfg.h
@@ -1,5 +1,5 @@
 /*
-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
+    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -14,18 +14,13 @@
     limitations under the License.
 */
 
-/**
- * @file    usbcfg.h
- * @brief   Serial-over-USB header
- */
+#ifndef USBCFG_H
+#define USBCFG_H
 
-#ifndef _USBCFG_H_
-#define _USBCFG_H_
-
-extern SerialUSBDriver SDU1;
-extern const SerialUSBConfig serusbcfg;
 extern const USBConfig usbcfg;
+extern SerialUSBConfig serusbcfg;
+extern SerialUSBDriver SDU1;
 
-#endif  /* _USBCFG_H_ */
+#endif  /* USBCFG_H */
 
 /** @} */
diff --git a/firmware/rusefi.cpp b/firmware/rusefi.cpp
index 43c6a4a51c..a4ee1b227e 100644
--- a/firmware/rusefi.cpp
+++ b/firmware/rusefi.cpp
@@ -272,5 +272,5 @@ int getRusEfiVersion(void) {
 	if (initBootloader() != 0)
 		return 123;
 #endif /* EFI_BOOTLOADER_INCLUDE_CODE */
-	return 20180123;
+	return 20180124;
 }