diff --git a/src/android/jsc_override.cpp b/src/android/jsc_override.cpp
index 84ddfbfd..469a6919 100644
--- a/src/android/jsc_override.cpp
+++ b/src/android/jsc_override.cpp
@@ -25,6 +25,7 @@
 
 #include "js_init.h"
 #include "shared_realm.hpp"
+#include "realm_coordinator.hpp"
 
 #if __arm__
 #define HOOK_SIZE 8
@@ -49,7 +50,7 @@ static JSGlobalContextRef create_context(JSContextGroupRef group, JSClassRef glo
     swap_function();
 
     // Clear cache from previous instances.
-    realm::Realm::s_global_cache.clear();
+    realm::_impl::RealmCoordinator::clear_all_caches();
 
     RJSInitializeInContext(ctx);
     realmContextInjected = true;
diff --git a/src/object-store/src/list.cpp b/src/object-store/src/list.cpp
index aee57506..47036c70 100644
--- a/src/object-store/src/list.cpp
+++ b/src/object-store/src/list.cpp
@@ -45,8 +45,8 @@ void List::verify_valid_row(size_t row_ndx, bool insertion) const
 {
     size_t size = m_link_view->size();
     if (row_ndx > size || (!insertion && row_ndx == size)) {
-        throw std::out_of_range("Index " + std::to_string(row_ndx) + " is outside of range 0..." +
-                                std::to_string(size) + ".");
+        throw std::out_of_range("Index " + to_string(row_ndx) + " is outside of range 0..." +
+                                to_string(size) + ".");
     }
 }