diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 99383b8ac8..715ab65ed9 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -133,7 +133,7 @@ LOCAL_CPP_FEATURES += exceptions rtti
 
 LOCAL_MODULE := mapswithme
 LOCAL_STATIC_LIBRARIES := stats_client map gui routing search storage indexer graphics platform anim geometry coding base expat freetype fribidi zlib bzip2 jansson tomcrypt protobuf
-LOCAL_CFLAGS := -ffunction-sections -fdata-sections -Wno-psabi -Wno-extern-c-compat
+LOCAL_CFLAGS := -ffunction-sections -fdata-sections -Wno-extern-c-compat
 
 ifneq ($(NDK_DEBUG),1)
   ifeq ($(PRODUCTION),1)
@@ -197,7 +197,7 @@ LOCAL_SRC_FILES := \
 	nv_thread/nv_thread.cpp \
 	nv_event/nv_event_queue.cpp \
 	nv_event/nv_event.cpp \
-	nv_time/nv_time.cpp
+	nv_time/nv_time.cpp \
 
 LOCAL_LDLIBS := -llog -lGLESv2
 
diff --git a/common.pri b/common.pri
index c2d5d675ea..d6c00fad81 100644
--- a/common.pri
+++ b/common.pri
@@ -16,11 +16,9 @@ INCLUDEPATH *= $$ROOT_DIR/3party/boost
 CONFIG -= depend_includepath
 
 CONFIG *= c++11
-# For old android gcc 4.6
-!android* {
-  QMAKE_CFLAGS   *= -Wno-deprecated-register -Wno-unused-local-typedefs
-  QMAKE_CXXFLAGS *= -Wno-deprecated-register -Wno-unused-local-typedefs
-}
+
+QMAKE_CFLAGS   *= -Wno-deprecated-register
+QMAKE_CXXFLAGS *= -Wno-deprecated-register
 
 # Automatically enable release config for production
 CONFIG(production) {
diff --git a/search/house_detector.cpp b/search/house_detector.cpp
index b9d30dbf85..6b21da4c53 100644
--- a/search/house_detector.cpp
+++ b/search/house_detector.cpp
@@ -31,7 +31,7 @@ namespace search
 namespace
 {
 
-#ifdef DEBUG
+#if 0
 void Houses2KML(ostream & s, map<search::House, double> const & m)
 {
   for (map<search::House, double>::const_iterator it = m.begin(); it != m.end(); ++it)