diff --git a/src/map/map.cpp b/src/map/map.cpp
index 7e16f9ba7..89d84b48f 100644
--- a/src/map/map.cpp
+++ b/src/map/map.cpp
@@ -240,7 +240,7 @@ void Map::stop(stop_callback cb, void *data) {
 }
 
 void Map::pause(bool waitForPause) {
-    assert(uv_thread_self() == mainThread);
+    assert(std::this_thread::get_id() == mainThread);
     assert(async);
     mutexRun.lock();
     pausing = true;
@@ -258,7 +258,7 @@ void Map::pause(bool waitForPause) {
 }
 
 void Map::resume() {
-    assert(uv_thread_self() == mainThread);
+    assert(std::this_thread::get_id() == mainThread);
     assert(async);
 
     mutexRun.lock();
diff --git a/src/storage/file_request_baton.cpp b/src/storage/file_request_baton.cpp
index 632e0f3fd..c661cd347 100644
--- a/src/storage/file_request_baton.cpp
+++ b/src/storage/file_request_baton.cpp
@@ -136,7 +136,7 @@ void FileRequestBaton::file_read(uv_fs_t *req) {
 }
 
 void FileRequestBaton::file_closed(uv_fs_t *req) {
-    assert(std::this_thread::get_id() == reinterpret_cast<FileRequestBaton *>(req->data)->thread_id);
+    assert(std::this_thread::get_id() == reinterpret_cast<FileRequestBaton *>(req->data)->threadId);
 
     if (req->result < 0) {
         // Closing the file failed. But there isn't anything we can do.