diff --git a/src/Makefile.am b/src/Makefile.am
index 00a84e9d..9699bb97 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -121,7 +121,7 @@ liblolcore_sources = \
     image/color/cie1931.cpp image/color/color.cpp \
     image/dither/random.cpp image/dither/ediff.cpp image/dither/dbs.cpp \
     image/dither/ostromoukhov.cpp image/dither/ordered.cpp \
-    image/filter/convolution.cpp image/filter/color.cpp \
+    image/filter/convolution.cpp image/filter/colors.cpp \
     image/filter/dilate.cpp image/filter/median.cpp image/filter/yuv.cpp \
     image/movie.cpp \
     \
diff --git a/src/application/application.cpp b/src/application/application.cpp
index 0977e6e5..43e2fa8c 100644
--- a/src/application/application.cpp
+++ b/src/application/application.cpp
@@ -88,6 +88,7 @@ void Application::Tick()
 void Application::Run()
 {
 #if EMSCRIPTEN
+    g_app = this;
     emscripten_set_main_loop(AppCallback, 0, 1);
 #else
     while (MustTick())
diff --git a/src/image/filter/color.cpp b/src/image/filter/colors.cpp
similarity index 100%
rename from src/image/filter/color.cpp
rename to src/image/filter/colors.cpp
diff --git a/src/lolcore.vcxproj b/src/lolcore.vcxproj
index bddbcfa7..51d736ef 100644
--- a/src/lolcore.vcxproj
+++ b/src/lolcore.vcxproj
@@ -134,7 +134,7 @@
     <ClCompile Include="image\codec\zed-palette-image.cpp" />
     <ClCompile Include="image\color\cie1931.cpp" />
     <ClCompile Include="image\color\color.cpp" />
-    <ClCompile Include="image\filter\color.cpp" />
+    <ClCompile Include="image\filter\colors.cpp" />
     <ClCompile Include="image\filter\convolution.cpp" />
     <ClCompile Include="image\filter\dilate.cpp" />
     <ClCompile Include="image\filter\median.cpp" />
@@ -427,4 +427,4 @@
   <ImportGroup Label="ExtensionTargets">
     <Import Project="$(SolutionDir)\msbuild\lolfx.targets" />
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/lolcore.vcxproj.filters b/src/lolcore.vcxproj.filters
index f0c300d4..7f308484 100644
--- a/src/lolcore.vcxproj.filters
+++ b/src/lolcore.vcxproj.filters
@@ -343,7 +343,7 @@
     <ClCompile Include="sys\thread.cpp">
       <Filter>sys</Filter>
     </ClCompile>
-    <ClCompile Include="image\filter\color.cpp">
+    <ClCompile Include="image\filter\colors.cpp">
       <Filter>image\filter</Filter>
     </ClCompile>
     <ClCompile Include="image\filter\convolution.cpp">
@@ -840,4 +840,4 @@
   <ItemGroup>
     <None Include="Makefile.am" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/platform/sdl/sdlinput.cpp b/src/platform/sdl/sdlinput.cpp
index af94edc3..0210bbbd 100644
--- a/src/platform/sdl/sdlinput.cpp
+++ b/src/platform/sdl/sdlinput.cpp
@@ -268,6 +268,7 @@ void SdlInputData::Tick(float seconds)
 #   endif
             {
                 //Lock management
+#   if defined SDLOL_CapsLock && defined SDLOL_ScrollLock && defined SDLOL_NumLockClear
             case SDLOL_CapsLock:
             case SDLOL_ScrollLock:
             case SDLOL_NumLockClear:
@@ -294,7 +295,11 @@ void SdlInputData::Tick(float seconds)
                         m_keyboard->GetKey(sc2) ? "up" : "down", event.key.repeat);
                     */
                 }
+#   endif
             default:
+#   if USE_OLD_SDL
+                m_keyboard->SetKey(sc, event.type == SDL_KEYDOWN);
+#   else
                 if (ScanCodeIsValid(sc))
                 {
                     m_keyboard->SetKey(sc, event.type == SDL_KEYDOWN);
@@ -321,6 +326,7 @@ void SdlInputData::Tick(float seconds)
                     Log::Error("unknown keypress (sym 0x%02x, scancode %0d)\n",
                                 event.key.keysym.sym, event.key.keysym.scancode);
                 */
+#   endif
             }
             break;