diff --git a/cpp/arcticdb/storage/file/mapped_file_storage.cpp b/cpp/arcticdb/storage/file/mapped_file_storage.cpp
index d450ba7270..7a482355ee 100644
--- a/cpp/arcticdb/storage/file/mapped_file_storage.cpp
+++ b/cpp/arcticdb/storage/file/mapped_file_storage.cpp
@@ -13,7 +13,6 @@
 #include <arcticdb/storage/storage_options.hpp>
 #include <arcticdb/codec/codec.hpp>
 #include <arcticdb/entity/serialized_key.hpp>
-
 namespace arcticdb::storage::file {
 
 MappedFileStorage::MappedFileStorage(const LibraryPath &lib, OpenMode mode, Config conf) :
diff --git a/cpp/arcticdb/storage/single_file_storage.hpp b/cpp/arcticdb/storage/single_file_storage.hpp
index 303106da0f..99a4838c29 100644
--- a/cpp/arcticdb/storage/single_file_storage.hpp
+++ b/cpp/arcticdb/storage/single_file_storage.hpp
@@ -63,7 +63,7 @@ struct formatter<arcticdb::storage::KeyData> {
 
     template<typename FormatContext>
     auto format(const arcticdb::storage::KeyData &k, FormatContext &ctx) const {
-        return format_to(ctx.out(), "{}:{}", k.key_offset_, k.key_size_);
+        return fmt::format_to(ctx.out(), "{}:{}", k.key_offset_, k.key_size_);
     }
 };
 
diff --git a/cpp/arcticdb/util/memory_mapped_file.hpp b/cpp/arcticdb/util/memory_mapped_file.hpp
index b3904a61fc..c5a15edfea 100644
--- a/cpp/arcticdb/util/memory_mapped_file.hpp
+++ b/cpp/arcticdb/util/memory_mapped_file.hpp
@@ -3,9 +3,8 @@
 #include <arcticdb/log/log.hpp>
 
 #ifdef WIN32
-
+#include <folly/gen/Base.h>
 #include "Windows.h"
-#include "winerror.h"
 
 namespace arcticdb {
 
@@ -18,6 +17,7 @@ namespace arcticdb {
 
     public:
         MemoryMappedFile() = default;
+        ARCTICDB_NO_MOVE_OR_COPY(MemoryMappedFile)
 
         size_t get_file_size(const std::string& file_path) {
             LARGE_INTEGER size;
@@ -122,7 +122,6 @@ namespace arcticdb {
     };
 
 }//namespace arcticdb
-
 #else
 #include <iostream>
 #include <sys/mman.h>