--- external/tinygettext/src/iconv.cpp.orig
+++ external/tinygettext/src/iconv.cpp
@@ -110,7 +110,7 @@
 
     // We try to avoid to much copying around, so we write directly into
     // a std::string
-    tinygettext_ICONV_CONST char* inbuf = const_cast<char*>(&text[0]);
+    tinygettext_ICONV_CONST const char* inbuf = const_cast<char*>(&text[0]);
     std::string result(outbytesleft, 'X');
     char* outbuf = &result[0];
 
--- src/engine/system/sdl_system.cpp.orig
+++ src/engine/system/sdl_system.cpp
@@ -25,7 +25,7 @@
 
 SDLSystem::SDLSystem()
 {
-  if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) != 0)
+  if (SDL_Init(SDL_INIT_VIDEO) != 0)
   {
     log_error("Unable to initialize SDL: %1%", SDL_GetError());
     exit(1);
--- src/util/system.cpp.orig
+++ src/util/system.cpp
@@ -476,7 +476,7 @@
 
   if (lang.empty() || lang == "C")
   {
-#ifndef __APPLE__
+#if !defined(__APPLE__) || __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1050
     return globals::default_language;
 #else /* on Mac OS X we get "C" if launched using Finder, so we ask the OS for the language */
     /* Note: this is used as last resort to allow the use of LANG when starting via Terminal */