diff --git a/fdbserver/tester.actor.cpp b/fdbserver/tester.actor.cpp
index 26e412f992..4eb1df393f 100644
--- a/fdbserver/tester.actor.cpp
+++ b/fdbserver/tester.actor.cpp
@@ -913,7 +913,7 @@ ACTOR Future<Void> clearData(Database cx, Optional<TenantName> defaultTenant) {
 
 			std::vector<Future<Void>> deleteFutures;
 			for (auto const& [id, entry] : tenants.results) {
-				if (entry.tenantName != defaultTenant) {
+				if (!defaultTenant.present() || entry.tenantName != defaultTenant.get()) {
 					deleteFutures.push_back(TenantAPI::deleteTenantTransaction(&tr, id));
 				}
 			}
diff --git a/fdbserver/workloads/DcLag.actor.cpp b/fdbserver/workloads/DcLag.actor.cpp
index 5711d2d32d..c812395ca4 100644
--- a/fdbserver/workloads/DcLag.actor.cpp
+++ b/fdbserver/workloads/DcLag.actor.cpp
@@ -75,7 +75,7 @@ struct DcLagWorkload : TestWorkload {
 		std::vector<IPAddress> ips; // all remote process IPs
 		for (const auto& process : g_simulator->getAllProcesses()) {
 			const auto& ip = process->address.ip;
-			if (process->locality.dcId().present() && process->locality.dcId().get() == g_simulator->remoteDcId) {
+			if (process->locality.dcId().present() && process->locality.dcId() == g_simulator->remoteDcId) {
 				ips.push_back(ip);
 			}
 		}
diff --git a/fdbserver/workloads/GcGenerations.actor.cpp b/fdbserver/workloads/GcGenerations.actor.cpp
index f813b57301..db7b8cf509 100644
--- a/fdbserver/workloads/GcGenerations.actor.cpp
+++ b/fdbserver/workloads/GcGenerations.actor.cpp
@@ -97,7 +97,7 @@ struct GcGenerationsWorkload : TestWorkload {
 		std::vector<IPAddress> remoteIps; // all remote process IPs
 		for (const auto& process : g_simulator->getAllProcesses()) {
 			const auto& ip = process->address.ip;
-			if (process->locality.dcId().present() && process->locality.dcId().get() == g_simulator->remoteDcId &&
+			if (process->locality.dcId().present() && process->locality.dcId() == g_simulator->remoteDcId &&
 			    !isCoordinator(coordinators, ip)) {
 				remoteIps.push_back(ip);
 			} else {
diff --git a/metacluster/include/metacluster/ConfigureTenant.actor.h b/metacluster/include/metacluster/ConfigureTenant.actor.h
index 2fd67f7405..41b47b5c22 100644
--- a/metacluster/include/metacluster/ConfigureTenant.actor.h
+++ b/metacluster/include/metacluster/ConfigureTenant.actor.h
@@ -233,7 +233,7 @@ struct ConfigureTenantImpl {
 			return Void();
 		}
 
-		if (self->updatedEntry.toTenantMapEntry() == tenantEntry) {
+		if (self->updatedEntry.toTenantMapEntry() == tenantEntry.get()) {
 			// No update to write to data cluster, just return.
 			return Void();
 		}
diff --git a/metacluster/include/metacluster/MetaclusterConsistency.actor.h b/metacluster/include/metacluster/MetaclusterConsistency.actor.h
index a0f9eda57a..002e697b60 100644
--- a/metacluster/include/metacluster/MetaclusterConsistency.actor.h
+++ b/metacluster/include/metacluster/MetaclusterConsistency.actor.h
@@ -214,12 +214,13 @@ private:
 			ASSERT_EQ(data.metaclusterRegistration.get().version, managementData.metaclusterRegistration.get().version);
 
 			if (data.tenantData.lastTenantId >= 0) {
-				ASSERT_EQ(TenantAPI::getTenantIdPrefix(data.tenantData.lastTenantId), managementData.tenantIdPrefix);
+				ASSERT_EQ(TenantAPI::getTenantIdPrefix(data.tenantData.lastTenantId),
+				          managementData.tenantIdPrefix.get());
 				ASSERT_LE(data.tenantData.lastTenantId, managementData.tenantData.lastTenantId);
 			} else {
 				CODE_PROBE(true, "Data cluster has no tenants with current tenant ID prefix");
 				for (auto const& [id, tenant] : data.tenantData.tenantMap) {
-					ASSERT_NE(TenantAPI::getTenantIdPrefix(id), managementData.tenantIdPrefix);
+					ASSERT_NE(TenantAPI::getTenantIdPrefix(id), managementData.tenantIdPrefix.get());
 				}
 			}
 
@@ -259,7 +260,8 @@ private:
 					ASSERT_EQ(metaclusterEntry.tenantState, TenantState::READY);
 					ASSERT(entry.tenantName == metaclusterEntry.tenantName);
 				} else if (entry.tenantName != metaclusterEntry.tenantName) {
-					ASSERT(entry.tenantName == metaclusterEntry.renameDestination);
+					ASSERT(metaclusterEntry.renameDestination.present() &&
+					       entry.tenantName == metaclusterEntry.renameDestination.get());
 				}
 				if (metaclusterEntry.tenantState != TenantState::UPDATING_CONFIGURATION &&
 				    metaclusterEntry.tenantState != TenantState::REMOVING) {