diff --git a/data/maps b/data/maps
index 7d27950a1..61edb4fd3 160000
--- a/data/maps
+++ b/data/maps
@@ -1 +1 @@
-Subproject commit 7d27950a169ae9f4692e9935dc9cae1331a038f2
+Subproject commit 61edb4fd35f15667cde8eb1cf80e5b0b30787a0b
diff --git a/src/game/client/components/menus_demo.cpp b/src/game/client/components/menus_demo.cpp
index b93c7d7dc..666dd3307 100644
--- a/src/game/client/components/menus_demo.cpp
+++ b/src/game/client/components/menus_demo.cpp
@@ -147,13 +147,9 @@ void CMenus::RenderDemoPlayer(CUIRect MainView)
 	if(Input()->KeyDown(KEY_SPACE))
 	{
 		if(!pInfo->m_Paused)
-		{
 			DemoPlayer()->Pause();
-		}
 		else
-		{
 			DemoPlayer()->Unpause();
-		}
 	}
 	
 	if(m_MenuActive)
@@ -227,7 +223,7 @@ void CMenus::RenderDemoPlayer(CUIRect MainView)
 		TextRender()->TextEx(&Cursor, aBuf, -1);
 	}
 
-	if(IncreaseDemoSpeed || Input()->KeyPresses(KEY_MOUSE_WHEEL_UP))
+	if(IncreaseDemoSpeed || Input()->KeyPresses(KEY_MOUSE_WHEEL_UP) || Input()->KeyDown(KEY_PLUS) || Input()->KeyDown(KEY_KP_PLUS))
 	{
 		if(pInfo->m_Speed < 0.1f) DemoPlayer()->SetSpeed(0.1f);
 		else if(pInfo->m_Speed < 0.25f) DemoPlayer()->SetSpeed(0.25f);
@@ -238,7 +234,7 @@ void CMenus::RenderDemoPlayer(CUIRect MainView)
 		else if(pInfo->m_Speed < 4.0f) DemoPlayer()->SetSpeed(4.0f);
 		else DemoPlayer()->SetSpeed(8.0f);
 	}
-	else if(DecreaseDemoSpeed || Input()->KeyPresses(KEY_MOUSE_WHEEL_DOWN))
+	else if(DecreaseDemoSpeed || Input()->KeyPresses(KEY_MOUSE_WHEEL_DOWN) || Input()->KeyDown(KEY_MINUS) || Input()->KeyDown(KEY_KP_MINUS))
 	{
 		if(pInfo->m_Speed > 4.0f) DemoPlayer()->SetSpeed(4.0f);
 		else if(pInfo->m_Speed > 2.0f) DemoPlayer()->SetSpeed(2.0f);