diff --git a/android/jni/com/mapswithme/maps/MapManager.cpp b/android/jni/com/mapswithme/maps/MapManager.cpp
index d14ccdeaca..7434ed7fd6 100644
--- a/android/jni/com/mapswithme/maps/MapManager.cpp
+++ b/android/jni/com/mapswithme/maps/MapManager.cpp
@@ -123,10 +123,10 @@ static void UpdateItem(JNIEnv * env, jobject item, NodeAttrs const & attrs)
   {
     CountryIdAndName const & info = attrs.m_parentInfo[0];
 
-    jni::ScopedLocalRef<jstring> const parentId(env, jni::ToJavaString(env, info.m_id));
+    jni::TScopedLocalRef const parentId(env, jni::ToJavaString(env, info.m_id));
     env->SetObjectField(item, countryItemFieldParentId, parentId.get());
 
-    jni::ScopedLocalRef<jstring> const parentName(env, jni::ToJavaString(env, info.m_localName));
+    jni::TScopedLocalRef const parentName(env, jni::ToJavaString(env, info.m_localName));
     env->SetObjectField(item, countryItemFieldParentName, parentName.get());
   }
   else
@@ -321,7 +321,7 @@ Java_com_mapswithme_maps_downloader_MapManager_nativeSubscribeOnCountryChanged(J
   {
     JNIEnv * env = jni::GetEnv();
     jmethodID methodID = jni::GetMethodID(env, g_countryChangedListener, "onCurrentCountryChanged", "(Ljava/lang/String;)V");
-    env->CallVoidMethod(g_countryChangedListener, methodID, jni::ToJavaString(env, countryId));
+    env->CallVoidMethod(g_countryChangedListener, methodID, jni::TScopedLocalRef(env, jni::ToJavaString(env, countryId)).get());
   };
 
   TCountryId const & prev = g_framework->NativeFramework()->GetLastReportedCountry();
diff --git a/android/res/layout/onmap_downloader.xml b/android/res/layout/onmap_downloader.xml
index 490bd3b24d..bbbbc25081 100644
--- a/android/res/layout/onmap_downloader.xml
+++ b/android/res/layout/onmap_downloader.xml
@@ -16,7 +16,7 @@
     android:layout_gravity="center"
     android:gravity="center_horizontal"
     android:background="?cardFrame"
-    android:visibility="visible"
+    android:visibility="gone"
     tools:visibility="visible"
     tools:ignore="UselessParent">
     <TextView
diff --git a/android/src/com/mapswithme/maps/downloader/MapManager.java b/android/src/com/mapswithme/maps/downloader/MapManager.java
index cb5fabc833..a40703119c 100644
--- a/android/src/com/mapswithme/maps/downloader/MapManager.java
+++ b/android/src/com/mapswithme/maps/downloader/MapManager.java
@@ -124,12 +124,12 @@ public final class MapManager
   public static native void nativeUnsubscribe(int slot);
 
   /**
-   * Subscribes to current country changes.
+   * Sets callback about current country change. Single subscriber only.
    */
   public static native void nativeSubscribeOnCountryChanged(CurrentCountryChangedListener listener);
 
   /**
-   * Unregisters current country changed callback.
+   * Removes callback about current country change.
    */
   public static native void nativeUnsubscribeOnCountryChanged();
 }