diff --git a/.gitignore b/.gitignore
index e16d067fd0..5c807052b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,8 @@
 .svn*
 .dep*
 *.o.d
+*.o
 build/
 Debug_EMS/
 Release_EMS/
-Debug/
\ No newline at end of file
+Debug/
diff --git a/firmware/console/eficonsole.cpp b/firmware/console/eficonsole.cpp
index a7bf1a4c0b..17922b9324 100644
--- a/firmware/console/eficonsole.cpp
+++ b/firmware/console/eficonsole.cpp
@@ -121,8 +121,8 @@ static void sayHello(void) {
  */
 static void cmd_threads(void) {
 #if CH_DBG_THREADS_PROFILING || defined(__DOXYGEN__)
-  static const char *states[] = { THD_STATE_NAMES };
-  Thread *tp;
+  static const char *states[] = { CH_STATE_NAMES };
+  thread_t *tp;
   
   scheduleMsg(&logger, "    addr    stack prio refs     state time");
   tp = chRegFirstThread();
diff --git a/firmware/util/rfiutil.h b/firmware/util/rfiutil.h
index f9770f792d..b0a79076c9 100644
--- a/firmware/util/rfiutil.h
+++ b/firmware/util/rfiutil.h
@@ -15,14 +15,17 @@
 
 #include "histogram.h"
 
+/**
+ * Unfortunately ChibiOS has two versions of methods for different
+ * contexts.
+ */
+#ifndef SIMULATOR
 #define isLocked() (ch.dbg.lock_cnt > 0)
-
-	/**
-	 * Unfortunately ChibiOS has two versions of methods for different
-	 * contexts.
-	 */
-
 #define isIsrContext() (ch.dbg.isr_cnt > 0)
+#else
+#define isLocked() (0)
+#define isIsrContext() (0)
+#endif
 
 #ifdef __cplusplus
 extern "C"