diff --git a/src/metadata_management.cc b/src/metadata_management.cc
index b10097004..4d1c62c70 100644
--- a/src/metadata_management.cc
+++ b/src/metadata_management.cc
@@ -622,7 +622,8 @@ void AttachBlobToBucket(SharedMemoryContext *context, RpcContext *rpc,
                         bool is_swap_blob) {
   MetadataManager *mdm = GetMetadataManagerFromContext(context);
 
-  int target_node = HashString(mdm, rpc, blob_name);
+  std::string internal_name = MakeInternalBlobName(blob_name, bucket_id);
+  int target_node = HashString(mdm, rpc, internal_name.c_str());
   BlobID blob_id = {};
   // NOTE(chogan): A negative node_id indicates a swap blob
   blob_id.bits.node_id = is_swap_blob ? -target_node : target_node;
diff --git a/src/metadata_storage_stb_ds.cc b/src/metadata_storage_stb_ds.cc
index 674ddb528..ba54842d1 100644
--- a/src/metadata_storage_stb_ds.cc
+++ b/src/metadata_storage_stb_ds.cc
@@ -546,8 +546,8 @@ u64 GetFromStorage(MetadataManager *mdm, const char *key, MapType map_type) {
 std::string ReverseGetFromStorage(MetadataManager *mdm, u64 id,
                                   MapType map_type) {
   std::string result;
-  size_t map_size = GetStoredMapSize(mdm, map_type);
   IdMap *map = GetMap(mdm, map_type);
+  size_t map_size = shlen(map);
 
   // TODO(chogan): @optimization This could be more efficient if necessary
   for (size_t i = 0; i < map_size; ++i) {