diff --git a/ogl_editor/src/Editor.c b/ogl_editor/src/Editor.c
index 14c6488..cc578c2 100644
--- a/ogl_editor/src/Editor.c
+++ b/ogl_editor/src/Editor.c
@@ -1022,6 +1022,7 @@ static void onSelectTrack()
 
 static void onInterpolation()
 {
+	int idx;
 	struct track_key newKey;
 	struct sync_track* track;
 	struct sync_track** tracks = getTracks();
@@ -1031,7 +1032,7 @@ static void onInterpolation()
 
 	track = tracks[getActiveTrack()];
 
-	int idx = key_idx_floor(track, getRowPos());
+	idx = key_idx_floor(track, getRowPos());
 	if (idx < 0) 
 		return;
 
@@ -1046,6 +1047,8 @@ static void onInterpolation()
 
 static void onEnterCurrentValue()
 {
+	int idx;
+	struct track_key key;
 	struct sync_track* track;
 	struct sync_track** tracks = getTracks();
 	const int rowPos = getRowPos();
@@ -1059,8 +1062,7 @@ static void onEnterCurrentValue()
 	if (!track->keys)
 		return;
 
-	struct track_key key;
-	int idx = sync_find_key(track, rowPos);
+	idx = sync_find_key(track, rowPos);
 	if (idx < 0)
 		idx = -idx - 1;
 
diff --git a/ogl_editor/src/Menu.h b/ogl_editor/src/Menu.h
index 4bbc36f..079b2ba 100644
--- a/ogl_editor/src/Menu.h
+++ b/ogl_editor/src/Menu.h
@@ -1,7 +1,11 @@
 #pragma once
 
+#include <wchar.h>
+
 #ifndef _WIN32
 #define _T(v) v
+#else
+#define _T(v) L ## v
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/ogl_editor/src/windows/RocketWindow.c b/ogl_editor/src/windows/RocketWindow.c
index 8936519..f8edc37 100644
--- a/ogl_editor/src/windows/RocketWindow.c
+++ b/ogl_editor/src/windows/RocketWindow.c
@@ -180,10 +180,10 @@ static int onKeyDown(WPARAM wParam, LPARAM lParam)
 
     switch (wParam)
     {
-        case VK_LEFT : key = EMGUI_ARROW_LEFT; break;
-        case VK_UP : key = EMGUI_ARROW_UP; break;
-        case VK_RIGHT : key = EMGUI_ARROW_RIGHT; break;
-        case VK_DOWN : key = EMGUI_ARROW_DOWN; break;
+        case VK_LEFT : key = EMGUI_KEY_ARROW_LEFT; break;
+        case VK_UP : key = EMGUI_KEY_ARROW_UP; break;
+        case VK_RIGHT : key = EMGUI_KEY_ARROW_RIGHT; break;
+        case VK_DOWN : key = EMGUI_KEY_ARROW_DOWN; break;
         case VK_SPACE : key = ' '; break;
 
         default: