diff --git a/build/config.mak b/build/config.mak
index 10f06af4e..3020a8436 100644
--- a/build/config.mak
+++ b/build/config.mak
@@ -1,12 +1,8 @@
-# You can edit this file to change build settings
+# You can override those settings on the command line
 
 PLATFORM ?= device
 VERBOSE ?= 0
 DEBUG ?= 1
-LIBA_LOG_DYNAMIC_MEMORY ?= 0
-ESCHER_LOG_EVENTS ?= 0
-ION_EVENTS ?= keyboard
-# Possible values : keyboard, stdin, random, replay
 
 # Do not edit below this
 
diff --git a/escher/Makefile b/escher/Makefile
index 12c973ee0..d14dc1c4d 100644
--- a/escher/Makefile
+++ b/escher/Makefile
@@ -1,9 +1,5 @@
 SFLAGS += -Iescher/include
 
-ifeq ($(ESCHER_LOG_EVENTS),1)
-SFLAGS += -DESCHER_LOG_EVENTS=1
-endif
-
 objs += $(addprefix escher/src/,\
   alternate_empty_view_controller.o\
   app.o\
diff --git a/ion/Makefile b/ion/Makefile
index c707dbbf5..472d4d4f4 100644
--- a/ion/Makefile
+++ b/ion/Makefile
@@ -4,7 +4,6 @@ include ion/src/$(PLATFORM)/Makefile
 objs += $(addprefix ion/src/shared/, \
   c.o \
   events.o \
-  events_$(ION_EVENTS).o \
 )
 
 tests += $(addprefix ion/test/,\
diff --git a/ion/src/blackbox/Makefile b/ion/src/blackbox/Makefile
index fef8239c7..2a2f48899 100644
--- a/ion/src/blackbox/Makefile
+++ b/ion/src/blackbox/Makefile
@@ -2,6 +2,7 @@ objs += $(addprefix ion/src/blackbox/, boot.o ion.o)
 objs += $(addprefix ion/src/shared/, \
   crc32.o \
   events.o \
+  events_stdin.o \
   log_printf.o \
   power.o \
 )
diff --git a/ion/src/device/Makefile b/ion/src/device/Makefile
index 61970aed8..986970daf 100644
--- a/ion/src/device/Makefile
+++ b/ion/src/device/Makefile
@@ -1,5 +1,9 @@
 include ion/src/device/boot/Makefile
 
+objs += $(addprefix ion/src/shared/, \
+  events_keyboard.o \
+)
+
 objs += $(addprefix ion/src/device/, \
   backlight.o \
   battery.o\
diff --git a/ion/src/emscripten/Makefile b/ion/src/emscripten/Makefile
index d8787d2c3..d10b149a9 100644
--- a/ion/src/emscripten/Makefile
+++ b/ion/src/emscripten/Makefile
@@ -5,5 +5,6 @@ objs += $(addprefix ion/src/emscripten/, \
 objs += $(addprefix ion/src/shared/, \
   crc32.o \
   events.o \
+  events_keyboard.o \
   power.o \
 )
diff --git a/ion/src/shared/log_printf.cpp b/ion/src/shared/log_printf.cpp
index 867d38088..f30643ea8 100644
--- a/ion/src/shared/log_printf.cpp
+++ b/ion/src/shared/log_printf.cpp
@@ -2,5 +2,6 @@
 #include <stdio.h>
 
 void Ion::Log::print(const char * message) {
-  printf("%s\n", message);
+  printf("%s", message);
+  fflush(stdout);
 }
diff --git a/ion/src/simulator/Makefile b/ion/src/simulator/Makefile
index d9e2bd545..19466fbe0 100644
--- a/ion/src/simulator/Makefile
+++ b/ion/src/simulator/Makefile
@@ -9,6 +9,7 @@ objs += $(addprefix ion/src/simulator/keyboard/, fltkkbd.o)
 
 objs += $(addprefix ion/src/shared/, \
   crc32.o \
+  events_keyboard.o \
   log_printf.o \
   power.o \
 )
diff --git a/liba/Makefile b/liba/Makefile
index c41582ab6..ca9ff4643 100644
--- a/liba/Makefile
+++ b/liba/Makefile
@@ -1,9 +1,5 @@
 SFLAGS += -Iliba/include
 
-ifeq ($(LIBA_LOG_DYNAMIC_MEMORY),1)
-SFLAGS += -DLIBA_LOG_DYNAMIC_MEMORY=1
-endif
-
 liba/src/external/sqlite/mem5.o: CFLAGS += -w
 
 objs += $(addprefix liba/src/, \