diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index 004f62d645..e3c13b83eb 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -1059,7 +1059,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
     addTask(mapTask);
   }
 
-  private boolean showBookmarkCategory(BookmarkCategory category)
+  private boolean showBookmarkCategory(@NonNull BookmarkCategory category)
   {
     Framework.nativeShowBookmarkCategory(category.getId());
     return true;
diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogFragment.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogFragment.java
index de2e7e08be..d9e2553043 100644
--- a/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogFragment.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksCatalogFragment.java
@@ -56,7 +56,7 @@ public class BookmarksCatalogFragment extends BaseWebViewMwmFragment
 
   @SuppressWarnings("NullableProblems")
   @NonNull
-  private CatalogListenerDecorator mCatalogListener;
+  private BookmarkManager.BookmarksCatalogListener mCatalogListener;
 
   @Override
   public void onCreate(@Nullable Bundle savedInstanceState)
diff --git a/android/src/com/mapswithme/maps/bookmarks/ShowOnMapCatalogCategoryFragment.java b/android/src/com/mapswithme/maps/bookmarks/ShowOnMapCatalogCategoryFragment.java
index 99ff8210b1..e10811c68f 100644
--- a/android/src/com/mapswithme/maps/bookmarks/ShowOnMapCatalogCategoryFragment.java
+++ b/android/src/com/mapswithme/maps/bookmarks/ShowOnMapCatalogCategoryFragment.java
@@ -31,6 +31,7 @@ public class ShowOnMapCatalogCategoryFragment extends DialogFragment
     mCategory = getCategoryOrThrow(args);
   }
 
+  @NonNull
   private BookmarkCategory getCategoryOrThrow(@Nullable Bundle args)
   {
     BookmarkCategory category;