diff --git a/firmware/events.c b/firmware/events.c
index 00c0099bb9..12f5ab1c8d 100644
--- a/firmware/events.c
+++ b/firmware/events.c
@@ -33,7 +33,7 @@ bool add_event(unsigned short id, bool oneshot, void (*handler))
 {
     int i;
     
-    /* Chcek if the event already exists. */
+    /* Check if the event already exists. */
     for (i = 0; i < MAX_SYS_EVENTS; i++)
     {
         if (events[i].callback == handler && events[i].id == id)
@@ -69,7 +69,7 @@ void remove_event(unsigned short id, void (*handler))
         }
     }
     
-    panicf("event not found");
+    panicf("event %d not found", (int)id);
 }
 
 void send_event(unsigned short id, void *data)
diff --git a/firmware/export/events.h b/firmware/export/events.h
index b4e8867483..9cd771964b 100644
--- a/firmware/export/events.h
+++ b/firmware/export/events.h
@@ -25,8 +25,8 @@
 #define MAX_SYS_EVENTS 10
 
 /**
- * High nibble = Event class definition
- * Low nibble  = Event ID
+ * High byte = Event class definition
+ * Low byte  = Event ID
  */
 
 #define EVENT_CLASS_DISK       0x0100