diff --git a/README.md b/README.md
index 4f75e0c12..6e28c7bb4 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ The SuperTuxKart homepage can be found at <https://supertuxkart.net/>. There is
 ## Hardware Requirements
 To run SuperTuxKart, make sure that your computer's specifications are equal or higher than the following specifications:
 
-* A graphics card capable of 3D rendering - NVIDIA GeForce 8 series and newer (GeForce 8100 or newer), AMD/ATI Radeon HD 4000 series and newer, Intel HD Graphics 3000 and newer. OpenGL >= 3.1
+* A graphics card capable of 3D rendering - NVIDIA GeForce 8 series and newer (GeForce 8100 or newer), AMD/ATI Radeon HD 4000 series and newer, Intel HD Graphics 3000 and newer. OpenGL >= 3.3
 * You should have a CPU that's running at 1 GHz or faster. 
 * You'll need at least 512 MB of free VRAM (video memory).
 * Minimum disk space: 800 MB 
diff --git a/lib/graphics_utils/mipmap/cpusimd.h b/lib/graphics_utils/mipmap/cpusimd.h
index 1dc2c730b..5e2cf30e5 100644
--- a/lib/graphics_utils/mipmap/cpusimd.h
+++ b/lib/graphics_utils/mipmap/cpusimd.h
@@ -38,11 +38,11 @@
  #include <mmintrin.h>
  #define CPU_MMX_SUPPORT (1)
 #endif
-#if __SSE__ || _M_X64 || _M_IX86_FP >= 1  || CPU_ENABLE_SSE
+#if __SSE__ || defined(_M_X64) || ( defined(_M_IX86_FP) && ( _M_IX86_FP >= 1 ) ) || CPU_ENABLE_SSE
  #include <xmmintrin.h>
  #define CPU_SSE_SUPPORT (1)
 #endif
-#if __SSE2__ || _M_X64 || _M_IX86_FP >= 2  || CPU_ENABLE_SSE2
+#if __SSE2__ || defined(_M_X64) || ( defined(_M_IX86_FP) && ( _M_IX86_FP >= 2 ) ) || CPU_ENABLE_SSE2
  #include <emmintrin.h>
  #define CPU_SSE2_SUPPORT (1)
 #endif
@@ -95,23 +95,23 @@
  #define CPU_POPCNT_SUPPORT (1)
 #endif
 #if __LZCNT__ || CPU_ENABLE_LZCNT
- #include <lzcntintrin.h>
+ #include <x86intrin.h>
  #define CPU_LZCNT_SUPPORT (1)
 #endif
 #if __F16C__ || CPU_ENABLE_F16C
- #include <f16cintrin.h>
+ #include <x86intrin.h>
  #define CPU_F16C_SUPPORT (1)
 #endif
 #if __BMI__ || CPU_ENABLE_BMI
- #include <bmiintrin.h>
+ #include <x86intrin.h>
  #define CPU_BMI_SUPPORT (1)
 #endif
 #if __BMI2__ || CPU_ENABLE_BMI2
- #include <bmi2intrin.h>
+ #include <x86intrin.h>
  #define CPU_BMI2_SUPPORT (1)
 #endif
 #if __TBM__ || CPU_ENABLE_TBM
- #include <tbmintrin.h>
+ #include <x86intrin.h>
  #define CPU_TBM_SUPPORT (1)
 #endif
 
diff --git a/src/graphics/central_settings.cpp b/src/graphics/central_settings.cpp
index 433b16c13..9891f6482 100644
--- a/src/graphics/central_settings.cpp
+++ b/src/graphics/central_settings.cpp
@@ -292,7 +292,7 @@ bool CentralVideoSettings::isARBGeometryShadersUsable() const
 bool CentralVideoSettings::isARBUniformBufferObjectUsable() const
 {
     return hasUBO ||
-        (m_gl_major_version > 3 || (m_gl_major_version == 3 && m_gl_minor_version >= 3));
+        (m_gl_major_version > 3 || (m_gl_major_version == 3 && m_gl_minor_version >= 1));
 }
 
 bool CentralVideoSettings::isARBExplicitAttribLocationUsable() const
diff --git a/src/graphics/sp/sp_texture.cpp b/src/graphics/sp/sp_texture.cpp
index 610b665b3..2ac799941 100644
--- a/src/graphics/sp/sp_texture.cpp
+++ b/src/graphics/sp/sp_texture.cpp
@@ -219,14 +219,12 @@ bool SPTexture::compressedTexImage2d(std::shared_ptr<video::IImage> texture,
                                      <core::dimension2du, unsigned> >&
                                      mipmap_sizes)
 {
-#ifndef SERVER_ONLY
+#if !defined(SERVER_ONLY) && !defined(USE_GLES2)
     unsigned format = GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
-#ifndef USE_GLES2
     if (m_undo_srgb)
     {
         format = GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT;
     }
-#endif
     glDeleteTextures(1, &m_texture_name);
     glGenTextures(1, &m_texture_name);
     glBindTexture(GL_TEXTURE_2D, m_texture_name);
diff --git a/src/main.cpp b/src/main.cpp
index f350180d6..6c32f49ca 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -608,10 +608,10 @@ void cmdLineHelp()
     "       --disable-light-shaft Disable light shafts (God rays).\n"
     "       --enable-dof       Enable depth of field.\n"
     "       --disable-dof      Disable depth of field.\n"
-    "       --enable-gi        Enable global illumination.\n"
-    "       --disable-gi       Disable global illumination.\n"
-    "       --enable-gfx       Enable animated scenery.\n"
-    "       --disable-gfx      Disable animated scenery.\n"
+    "       --enable-particles  Enable particles.\n"
+    "       --disable-particles Disable particles.\n"
+    "       --enable-animated-characters  Enable animated characters.\n"
+    "       --disable-animated-characters Disable animated characters.\n"
     "       --enable-motion-blur Enable motion blur.\n"
     "       --disable-motion-blur Disable motion blur.\n"
     "       --enable-mlaa      Enable anti-aliasing.\n"
@@ -626,8 +626,6 @@ void cmdLineHelp()
     "       --disable-hd-textures Disable high definition textures.\n"
     "       --enable-dynamic-lights Enable advanced pipline.\n"
     "       --disable-dynamic-lights Disable advanced pipline.\n"
-    "       --enable-trilinear  Use trilinear texture filtering.\n"
-    "       --disable-trilinear Use bilinear texture filtering.\n"
     "       --anisotropic=n     Anisotropic filtering quality (0 to disable).\n"
     "                           Takes precedence over trilinear or bilinear\n"
     "                           texture filtering.\n"
@@ -1681,7 +1679,7 @@ int main(int argc, char *argv[] )
                     #ifdef USE_GLES2
                     irr::core::stringw version = "OpenGL ES 3.0";
                     #else
-                    irr::core::stringw version = "OpenGL 3.1";
+                    irr::core::stringw version = "OpenGL 3.3";
                     #endif
                     MessageDialog *dialog =
                         new MessageDialog(_("Your OpenGL version appears to be "