diff --git a/android/src/com/mapswithme/maps/location/LocationPredictor.java b/android/src/com/mapswithme/maps/location/LocationPredictor.java
index b6da1e5770..2adae3ba62 100644
--- a/android/src/com/mapswithme/maps/location/LocationPredictor.java
+++ b/android/src/com/mapswithme/maps/location/LocationPredictor.java
@@ -15,8 +15,8 @@ public class LocationPredictor
   private Handler mHandler;
 
   private LocationHelper.LocationListener mListener;
-  private Location mLastLocation = null;
-  private boolean mGeneratePredictions = false;
+  private Location mLastLocation;
+  private boolean mGeneratePredictions;
   private int mPredictionCount;
   private int mConnectionSlot;
 
diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
index 46605ae064..8fe1c16976 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
@@ -1,5 +1,6 @@
 package com.mapswithme.maps.widget.placepage;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
@@ -763,11 +764,11 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
   }
 
   @Override
+  @SuppressLint("NewApi")
   public boolean onLongClick(View v)
   {
-    /// @todo Review this code in case of API level < 11.
-    if (Utils.apiLowerThan(11))
-      return true;
+    // This callback is invoked only for API level >= 11.
+    // See initViews function for more details.
 
     final Object tag = v.getTag();
     final String tagStr = tag == null ? "" : tag.toString();