diff --git a/Core/System.cpp b/Core/System.cpp
index da48ca9969..18c2b94687 100644
--- a/Core/System.cpp
+++ b/Core/System.cpp
@@ -112,7 +112,7 @@ void PSP_Shutdown()
 	currentCPU = 0;
 }
 
-const CoreParameter &PSP_CoreParameter()
+CoreParameter &PSP_CoreParameter()
 {
 	return coreParameter;
 }
diff --git a/Core/System.h b/Core/System.h
index 352897e640..a3340b2a21 100644
--- a/Core/System.h
+++ b/Core/System.h
@@ -29,4 +29,4 @@ bool PSP_IsInited();
 void PSP_Shutdown();
 void PSP_HWAdvance(int cycles);
 void PSP_SWI();
-const CoreParameter &PSP_CoreParameter();
\ No newline at end of file
+CoreParameter &PSP_CoreParameter();
\ No newline at end of file
diff --git a/GPU/GLES/DisplayListInterpreter.cpp b/GPU/GLES/DisplayListInterpreter.cpp
index 02caa9f5f6..3f4154ad11 100644
--- a/GPU/GLES/DisplayListInterpreter.cpp
+++ b/GPU/GLES/DisplayListInterpreter.cpp
@@ -78,7 +78,7 @@ void GLES_GPU::InitClear()
 		//	glClearColor(1,0,1,1);
 		glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
 	}
-	glViewport(0, 0, 480 * g_Config.iWindowZoom , 272 * g_Config.iWindowZoom );
+	glViewport(0, 0, PSP_CoreParameter().pixelWidth, PSP_CoreParameter().pixelHeight);
 }
 
 void GLES_GPU::BeginFrame()
@@ -118,7 +118,7 @@ void GLES_GPU::CopyDisplayToOutput()
 	VirtualFramebuffer *vfb = GetDisplayFBO();
 	fbo_unbind();
 
-	glViewport(0, 0, 480 * g_Config.iWindowZoom , 272 * g_Config.iWindowZoom );
+	glViewport(0, 0, PSP_CoreParameter().pixelWidth, PSP_CoreParameter().pixelHeight);
 
 	currentRenderVfb_ = 0;
 
diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp
index a80e17345c..dfcbb99462 100644
--- a/Windows/WndMainWindow.cpp
+++ b/Windows/WndMainWindow.cpp
@@ -18,6 +18,7 @@
 #include "main.h"
 
 #include "../Core/Core.h"
+#include "../Core/System.h"
 #include "../Core/MemMap.h"
 #include "EmuThread.h"
 
@@ -117,6 +118,8 @@ namespace MainWindow
 		GetWindowRectAtZoom(zoom, rc, rcOuter);
 		MoveWindow(hwndMain, rcOuter.left, rcOuter.top, rcOuter.right - rcOuter.left, rcOuter.bottom - rcOuter.top, TRUE);
 		MoveWindow(hwndDisplay, 0, 0, rc.right - rc.left, rc.bottom - rc.top, TRUE);
+		PSP_CoreParameter().pixelWidth = 480 * zoom;
+		PSP_CoreParameter().pixelHeight = 272 * zoom;
 		GL_Resized();
 	}
 
diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc
index eab8d124d4..8ddb89699d 100644
--- a/Windows/ppsspp.rc
+++ b/Windows/ppsspp.rc
@@ -190,8 +190,8 @@ BEGIN
     END
     POPUP "&Emulation"
     BEGIN
-        MENUITEM "&Run",                        ID_EMULATION_RUN
-        MENUITEM "&Pause",                      ID_EMULATION_PAUSE
+        MENUITEM "&Run\tF7",                    ID_EMULATION_RUN
+        MENUITEM "&Pause\tF8",                  ID_EMULATION_PAUSE
         MENUITEM SEPARATOR
         MENUITEM "R&eset",                      ID_EMULATION_RESET
         MENUITEM SEPARATOR
@@ -313,9 +313,6 @@ BEGIN
     "R",            ID_DEBUG_REGISTERS,     VIRTKEY, CONTROL, NOINVERT
     VK_F8,          ID_EMULATION_PAUSE,     VIRTKEY, NOINVERT
     VK_F7,          ID_EMULATION_RUN,       VIRTKEY, NOINVERT
-    //VK_F4,          ID_FILE_LOADSTATE,      VIRTKEY, NOINVERT
-    //VK_F5,          ID_FILE_REFRESHGAMELIST, VIRTKEY, NOINVERT
-    //VK_F2,          ID_FILE_SAVESTATE,      VIRTKEY, NOINVERT
     "1",          ID_OPTIONS_SCREEN1X,       VIRTKEY, CONTROL, NOINVERT
     "2",          ID_OPTIONS_SCREEN2X,       VIRTKEY, CONTROL, NOINVERT
     "3",          ID_OPTIONS_SCREEN3X,       VIRTKEY, CONTROL, NOINVERT