diff --git a/Aquaria/DSQ.cpp b/Aquaria/DSQ.cpp
index 574cd73..e7fa8c8 100644
--- a/Aquaria/DSQ.cpp
+++ b/Aquaria/DSQ.cpp
@@ -274,7 +274,7 @@ void DSQ::rumble(float leftMotor, float rightMotor, float time)
 {
 	//if (this->inputMode == INPUT_JOYSTICK)
 	//	core->joystick.rumble(leftMotor, rightMotor, time);
-	assert(false); // FIXME
+	//assert(false); // FIXME
 }
 
 void DSQ::newGame()
diff --git a/Aquaria/InGameMenu.cpp b/Aquaria/InGameMenu.cpp
index 2c95ae7..d49b6df 100644
--- a/Aquaria/InGameMenu.cpp
+++ b/Aquaria/InGameMenu.cpp
@@ -966,7 +966,7 @@ void InGameMenu::action(int id, int state, int source)
 		}
 	}
 
-	if(id == ACTION_ESC)
+	if(id == ACTION_ESC && !state)
 	{
 		if (isInGameMenu())
 		{
@@ -3864,6 +3864,8 @@ void InGameMenu::updateOptionsMenu(float dt)
 
 void InGameMenu::update(float dt)
 {
+	ActionMapper::onUpdate(dt);
+
 	if (menuSelectDelay > 0)
 	{
 		menuSelectDelay -= dt;