diff --git a/reactos/dll/cpl/console/layout.c b/reactos/dll/cpl/console/layout.c
index 43ed500df04..19c56b96685 100644
--- a/reactos/dll/cpl/console/layout.c
+++ b/reactos/dll/cpl/console/layout.c
@@ -131,7 +131,7 @@ PaintText(LPDRAWITEMSTRUCT drawItem,
                        FALSE,
                        FALSE,
                        FALSE,
-                       OEM_CHARSET,
+                       CodePageToCharSet(pConInfo->CodePage),
                        OUT_DEFAULT_PRECIS,
                        CLIP_DEFAULT_PRECIS,
                        DEFAULT_QUALITY,
@@ -233,11 +233,11 @@ LayoutProc(HWND hwndDlg,
 
         case WM_NOTIFY:
         {
-            LPNMUPDOWN  lpnmud =  (LPNMUPDOWN)lParam;
-            LPPSHNOTIFY lppsn  = (LPPSHNOTIFY)lParam;
+            LPPSHNOTIFY lppsn = (LPPSHNOTIFY)lParam;
 
             if (lppsn->hdr.code == UDN_DELTAPOS)
             {
+                LPNMUPDOWN lpnmud = (LPNMUPDOWN)lParam;
                 DWORD wheight, wwidth;
                 DWORD sheight, swidth;
                 DWORD left, top;
diff --git a/reactos/dll/cpl/console/options.c b/reactos/dll/cpl/console/options.c
index b4508489be9..ec97f968eab 100644
--- a/reactos/dll/cpl/console/options.c
+++ b/reactos/dll/cpl/console/options.c
@@ -107,11 +107,12 @@ OptionsProc(HWND hwndDlg,
 
         case WM_NOTIFY:
         {
-            LPNMUPDOWN  lpnmud =  (LPNMUPDOWN)lParam;
-            LPPSHNOTIFY lppsn  = (LPPSHNOTIFY)lParam;
+            LPPSHNOTIFY lppsn = (LPPSHNOTIFY)lParam;
 
             if (lppsn->hdr.code == UDN_DELTAPOS)
             {
+                LPNMUPDOWN lpnmud = (LPNMUPDOWN)lParam;
+
                 if (lppsn->hdr.idFrom == IDC_UPDOWN_BUFFER_SIZE)
                 {
                     lpnmud->iPos = min(max(lpnmud->iPos + lpnmud->iDelta, 1), 999);