4 files changed, 8 insertions, 28 deletions
diff --git a/src/zenserver/frontend/zipfs.cpp b/src/zenserver/frontend/zipfs.cpp
index 42df0520f..f9c2bc8ff 100644
--- a/src/zenserver/frontend/zipfs.cpp
+++ b/src/zenserver/frontend/zipfs.cpp
@@ -149,25 +149,13 @@ ZipFs::ZipFs(IoBuffer&& Buffer)
 IoBuffer
 ZipFs::GetFile(const std::string_view& FileName) const
 {
+	FileMap::iterator Iter = m_Files.find(FileName);
+	if (Iter == m_Files.end())
 	{
-		RwLock::SharedLockScope _(m_FilesLock);
-
-		FileMap::const_iterator Iter = m_Files.find(FileName);
-		if (Iter == m_Files.end())
-		{
-			return {};
-		}
-
-		const FileItem& Item = Iter->second;
-		if (Item.GetSize() > 0)
-		{
-			return IoBuffer(IoBuffer::Wrap, Item.GetData(), Item.GetSize());
-		}
+		return {};
 	}
 
-	RwLock::ExclusiveLockScope _(m_FilesLock);
-
-	FileItem& Item = m_Files.find(FileName)->second;
+	FileItem& Item = Iter->second;
 	if (Item.GetSize() > 0)
 	{
 		return IoBuffer(IoBuffer::Wrap, Item.GetData(), Item.GetSize());
diff --git a/src/zenserver/frontend/zipfs.h b/src/zenserver/frontend/zipfs.h
index 19f96567c..1fa7da451 100644
--- a/src/zenserver/frontend/zipfs.h
+++ b/src/zenserver/frontend/zipfs.h
@@ -3,7 +3,6 @@
 #pragma once
 
 #include <zencore/iobuffer.h>
-#include <zencore/thread.h>
 
 #include <unordered_map>
 
@@ -21,7 +20,6 @@ public:
 private:
 	using FileItem = MemoryView;
 	using FileMap  = std::unordered_map<std::string_view, FileItem>;
-	mutable RwLock m_FilesLock;
 	FileMap mutable m_Files;
 	IoBuffer m_Buffer;
 };
diff --git a/src/zenserver/hub/hubservice.cpp b/src/zenserver/hub/hubservice.cpp
index a00446a75..4d9da3a57 100644
--- a/src/zenserver/hub/hubservice.cpp
+++ b/src/zenserver/hub/hubservice.cpp
@@ -151,7 +151,6 @@ struct StorageServerInstance
 	inline uint16_t GetBasePort() const { return m_ServerInstance.GetBasePort(); }
 
 private:
-	void				  WakeLocked();
 	RwLock				  m_Lock;
 	std::string			  m_ModuleId;
 	std::atomic<bool>	  m_IsProvisioned{false};
@@ -212,7 +211,7 @@ StorageServerInstance::Provision()
 
 	if (m_IsHibernated)
 	{
-		WakeLocked();
+		Wake();
 	}
 	else
 	{
@@ -295,15 +294,10 @@ StorageServerInstance::Hibernate()
 void
 StorageServerInstance::Wake()
 {
-	RwLock::ExclusiveLockScope _(m_Lock);
-	WakeLocked();
-}
-
-void
-StorageServerInstance::WakeLocked()
-{
 	// Start server in-place using existing data
 
+	RwLock::ExclusiveLockScope _(m_Lock);
+
 	if (!m_IsHibernated)
 	{
 		ZEN_WARN("Attempted to wake storage server instance for module '{}' which is not hibernated", m_ModuleId);
diff --git a/src/zenserver/storage/buildstore/httpbuildstore.cpp b/src/zenserver/storage/buildstore/httpbuildstore.cpp
index bf7afcc02..f5ba30616 100644
--- a/src/zenserver/storage/buildstore/httpbuildstore.cpp
+++ b/src/zenserver/storage/buildstore/httpbuildstore.cpp
@@ -185,7 +185,7 @@ HttpBuildStoreService::GetBlobRequest(HttpRouterRequest& Req)
 	{
 		const HttpRange& Range		 = Ranges.front();
 		const uint64_t	 BlobSize	 = Blob.GetSize();
-		const uint64_t	 MaxBlobSize = Range.Start < BlobSize ? BlobSize - Range.Start : 0;
+		const uint64_t	 MaxBlobSize = Range.Start < BlobSize ? Range.Start - BlobSize : 0;
 		const uint64_t	 RangeSize	 = Min(Range.End - Range.Start + 1, MaxBlobSize);
 		if (Range.Start + RangeSize > BlobSize)
 		{