diff --git a/Makefile b/Makefile
index ba8801a38..25ebc45b6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,8 @@
-CPPFLAGS=-I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux -I/usr/include/freetype2 -I/usr/include/SDL -D_RPI_
+CPPFLAGS=-I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads -I/opt/vc/include/interface/vmcs_host/linux -I/usr/include/freetype2 -I/usr/include/SDL -std=c++0x
+CPPFLAGS+=-DUSE_OPENGL_ES -D_RPI_
 LIBS=-L/opt/vc/lib -lbcm_host -lEGL -lGLESv2 -lfreetype -lSDL -lboost_system -lboost_filesystem -lfreeimage -lSDL_mixer
+
 ADDITIONAL_SRC_SOURCES=Renderer_init_rpi.cpp
+FT_FREETYPE_H_PATH=/usr/include/freetype
 
 include Makefile.common
diff --git a/src/InputManager.cpp b/src/InputManager.cpp
index 20e8a17e1..25b0af40a 100644
--- a/src/InputManager.cpp
+++ b/src/InputManager.cpp
@@ -9,8 +9,8 @@
 namespace fs = boost::filesystem;
 
 InputManager::InputManager(Window* window) : mWindow(window), 
-	mJoysticks(NULL), mInputConfigs(NULL), mKeyboardInputConfig(NULL), mPrevAxisValues(NULL),
-	mNumJoysticks(0), mNumPlayers(0)
+	mNumJoysticks(0), mNumPlayers(0), mJoysticks(NULL), 
+	mInputConfigs(NULL), mKeyboardInputConfig(NULL), mPrevAxisValues(NULL)
 {
 }