diff --git a/android/cpp/jni.cpp b/android/cpp/jni.cpp
index 010b90c8e..3862fbecf 100644
--- a/android/cpp/jni.cpp
+++ b/android/cpp/jni.cpp
@@ -375,7 +375,7 @@ jlong JNICALL nativeGetDefaultTransitionDuration(JNIEnv* env, jobject obj, jlong
     mbgl::Log::Debug(mbgl::Event::JNI, "nativeGetDefaultTransitionDuration");
     assert(native_map_view_ptr != 0);
     NativeMapView* native_map_view = reinterpret_cast<NativeMapView*>(native_map_view_ptr);
-    jlong ret = 0.0;
+    jlong ret = 0;
     COFFEE_TRY_JNI(env, ret = native_map_view->getMap().getDefaultTransitionDuration());
     return ret;
 }
diff --git a/src/map/map.cpp b/src/map/map.cpp
index 6ce38863d..3578914d6 100644
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -440,7 +440,7 @@ void Map::setStyleJSON(std::string newStyleJSON, const std::string &base) {
 
     style->setDefaultTransitionDuration(defaultTransitionDuration);
 
-    // set applied classes if theys were set while the style was loading
+    // set applied classes if they were set while the style was loading
     appliedClassesMutex.lock();
     util::ptr<std::vector<std::string>> classes = appliedClasses;
     if (appliedClasses) {