diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 3b79a8370e..7a039cae4b 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -35,7 +35,7 @@ LOCAL_SRC_FILES := \
 	com/mapswithme/maps/MWMActivity.cpp \
 	
 LOCAL_LDLIBS := -llog -lGLESv1_CM \
-  	-lwords -lmap -lstorage -lversion -lsearch -lindexer -lyg -lplatform \
+  	-lwords -lmap -lversion -lsearch -lstorage -lindexer -lyg -lplatform \
   	-lgeometry -lcoding -lbase -lexpat -lfreetype -lfribidi -lzlib -lbzip2 \
   	-ljansson -ltomcrypt ./obj/local/armeabi/libstdc++.a
 
diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp
index 2d7cc3acff..dcf3988d9a 100644
--- a/android/jni/com/mapswithme/maps/Framework.cpp
+++ b/android/jni/com/mapswithme/maps/Framework.cpp
@@ -205,10 +205,10 @@ namespace android
 
   void Framework::EnableLocation(bool enable)
   {
-    if (enable)
-      m_work.StartLocationService(bind(&f));
-    else
-      m_work.StopLocationService();
+//    if (enable)
+//      m_work.StartLocationService(bind(&f));
+//    else
+//      m_work.StopLocationService();
   }
 
   void Framework::UpdateLocation(uint64_t timestamp, double lat, double lon, float accuracy)
@@ -218,10 +218,10 @@ namespace android
     info.m_latitude = lat;
     info.m_longitude = lon;
     info.m_horizontalAccuracy = accuracy;
-    info.m_status = location::EAccurateMode;
-    info.m_altitude = 0;
-    info.m_course = 0;
-    info.m_verticalAccuracy = 0;
+//    info.m_status = location::EAccurateMode;
+//    info.m_altitude = 0;
+//    info.m_course = 0;
+//    info.m_verticalAccuracy = 0;
     m_work.OnGpsUpdate(info);
   }
 
diff --git a/android/default.properties b/android/project.properties
similarity index 80%
rename from android/default.properties
rename to android/project.properties
index 66db0d159b..f049142c17 100644
--- a/android/default.properties
+++ b/android/project.properties
@@ -4,7 +4,7 @@
 # This file must be checked in Version Control Systems.
 #
 # To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
+# "ant.properties", and override values to adapt the script to your
 # project structure.
 
 # Project target.
diff --git a/omim.pro b/omim.pro
index 4ae9256f13..9511455612 100644
--- a/omim.pro
+++ b/omim.pro
@@ -30,7 +30,7 @@ SUBDIRS = 3party \
           publisher publisher/publisher_tests \
           console_sloynik
 } else {
-  # libraries which are used on iphone and bada
+  # libraries which are used on mobile devices
   SUBDIRS = 3party \
             base \
             coding \