diff --git a/android/cpp/JNI.cpp b/android/cpp/JNI.cpp
index 1b9613ab7..31bbc963e 100644
--- a/android/cpp/JNI.cpp
+++ b/android/cpp/JNI.cpp
@@ -682,7 +682,8 @@ extern "C" JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
         return JNI_ERR;
     }
 
-    std::array<JNINativeMethod, 54> methods = {{ // Can remove the extra brace in C++14
+    // NOTE: if you get java.lang.UnsatisfiedLinkError you likely forgot to set the size of the array correctly (too large)
+    std::array<JNINativeMethod, 50> methods = {{ // Can remove the extra brace in C++14
         { "nativeCreate", "(Ljava/lang/String;)J", reinterpret_cast<void*>(&nativeCreate) },
         { "nativeDestroy", "(J)V", reinterpret_cast<void*>(&nativeDestroy) },
         { "nativeInitializeDisplay", "(J)V", reinterpret_cast<void*>(&nativeInitializeDisplay) },
diff --git a/android/cpp/NativeMapView.cpp b/android/cpp/NativeMapView.cpp
index 1cd416617..cb03204b3 100644
--- a/android/cpp/NativeMapView.cpp
+++ b/android/cpp/NativeMapView.cpp
@@ -543,7 +543,7 @@ void MBGLView::notify() {
 void MBGLView::notify_map_change(mbgl::MapChange change, mbgl::timestamp delay) {
     DEBUG("MBGLView::notify_map_change()");
     nativeView->notifyMapChange();
-    // TODO: use new variables
+    // TODO: use new variables - do i need to?
     (void)change;
     (void)delay;
 }