diff --git a/android/jni/nv_time/nv_time.cpp b/android/jni/nv_time/nv_time.cpp
index c833d74703..a2d421ccca 100644
--- a/android/jni/nv_time/nv_time.cpp
+++ b/android/jni/nv_time/nv_time.cpp
@@ -104,6 +104,7 @@ bool nvValidTimeExtension()
 		return false;
 	else
 		return true;*/
+  return false;
 }
 
 long nvGetSystemTime()
diff --git a/base/commands_queue.hpp b/base/commands_queue.hpp
index 9796732b0f..fa6833f6e6 100644
--- a/base/commands_queue.hpp
+++ b/base/commands_queue.hpp
@@ -83,14 +83,12 @@ namespace core
 
       Chain();
 
-      template <typename fun_tt>
-      Chain(fun_tt fn)
+      Chain(function_t const & fn)
       {
         m_fns.push_back(fn);
       }
 
-      template <typename fun_tt>
-      Chain & addCommand(fun_tt fn)
+      Chain & addCommand(function_t const & fn)
       {
         m_fns.push_back(fn);
         return *this;
diff --git a/graphics/opengl/opengl_es2.cpp b/graphics/opengl/opengl_es2.cpp
index 97f1e75ce6..9717ee514e 100644
--- a/graphics/opengl/opengl_es2.cpp
+++ b/graphics/opengl/opengl_es2.cpp
@@ -9,7 +9,7 @@ namespace graphics
 #ifndef OMIM_OS_IPHONE
     namespace
     {
-      void emptyFlushFn() {}
+      void OPENGL_CALLING_CONVENTION emptyFlushFn() {}
     }
 #endif
 
diff --git a/std/target_os.hpp b/std/target_os.hpp
index 9474dedc24..7aec82416b 100644
--- a/std/target_os.hpp
+++ b/std/target_os.hpp
@@ -4,7 +4,9 @@
   #define OMIM_OS_ANDROID
   #define OMIM_OS_NAME "android"
   #define OMIM_OS_MOBILE
-  #define OMIM_HAS_DEBUG_STL 1
+  #if __cplusplus <= 199711L
+    #define OMIM_HAS_DEBUG_STL 1
+  #endif
 
 #elif defined(_TIZEN_EMULATOR) || defined(_TIZEN_DEVICE)
   #define OMIM_OS_TIZEN
@@ -49,5 +51,5 @@
   #define OMIM_OS_NAME "linux"
   #define OMIM_OS_DESKTOP
   #define OMIM_HAS_DEBUG_STL 1
-  
+
 #endif