diff --git a/src/realm/query_expression.hpp b/src/realm/query_expression.hpp
index 70ae2a0e0c9..bd6e1a89817 100644
--- a/src/realm/query_expression.hpp
+++ b/src/realm/query_expression.hpp
@@ -2131,7 +2131,7 @@ class SimpleQuerySupport : public Subexpr2<T> {
 
         auto sz = result.size();
         for (size_t i = 0; i < sz; i++) {
-            auto ndxs = m_link_map.get_origin_ndxs(result.get(i));
+            auto ndxs = m_link_map.get_origin_ndxs(size_t(result.get(i)));
             ret.insert(ret.end(), ndxs.begin(), ndxs.end());
         }
         result.destroy();
@@ -3252,7 +3252,7 @@ class Columns : public Subexpr2<T> {
 
         auto sz = result.size();
         for (size_t i = 0; i < sz; i++) {
-            auto ndxs = m_link_map.get_origin_ndxs(result.get(i));
+            auto ndxs = m_link_map.get_origin_ndxs(size_t(result.get(i)));
             ret.insert(ret.end(), ndxs.begin(), ndxs.end());
         }
         result.destroy();
diff --git a/src/realm/util/file.cpp b/src/realm/util/file.cpp
index b7d4d69e6c2..33d603aae1c 100644
--- a/src/realm/util/file.cpp
+++ b/src/realm/util/file.cpp
@@ -734,7 +734,7 @@ void File::prealloc(size_t size)
             // We need to prevent concurrent calls to lseek from the encryption layer
             // while we're writing to the file to extend it. Otherwise an intervening
             // lseek may redirect the writing process, causing file corruption.
-            UniqueLock lock(util::mapping_mutex);
+            UniqueLock lck(util::mapping_mutex);
             manually_consume_space();
         }
         else {