diff --git a/fdbclient/SystemData.cpp b/fdbclient/SystemData.cpp
index dedcc26588..e8f2c21333 100644
--- a/fdbclient/SystemData.cpp
+++ b/fdbclient/SystemData.cpp
@@ -273,9 +273,9 @@ std::pair<vector<std::pair<UID, NetworkAddress>>, vector<std::pair<UID, NetworkA
 	return std::make_pair(logs, oldLogs);
 }
 
-const KeyRef serverKeysPrefix = LiteralStringRef("\xff/serverKeys/");
-const ValueRef serverKeysTrue = LiteralStringRef("1"), // compatible with what was serverKeysTrue
-    serverKeysTrueEmptyRange = LiteralStringRef("3"), // the server treats the range as empty.
+const KeyRef serverKeysPrefix ="\xff/serverKeys/"_sr;
+const ValueRef serverKeysTrue = "1"_sr, // compatible with what was serverKeysTrue
+    serverKeysTrueEmptyRange ="3"_sr, // the server treats the range as empty.
     serverKeysFalse;
 
 const Key serverKeysKey(UID serverID, const KeyRef& key) {
diff --git a/fdbserver/MoveKeys.actor.cpp b/fdbserver/MoveKeys.actor.cpp
index dff9a1555e..74d60ec627 100644
--- a/fdbserver/MoveKeys.actor.cpp
+++ b/fdbserver/MoveKeys.actor.cpp
@@ -238,13 +238,13 @@ ACTOR Future<vector<UID>> addReadWriteDestinations(KeyRangeRef shard,
 
 // Returns storage servers selected from 'candidates', who is serving a read-write copy of 'range'.
 ACTOR Future<std::vector<UID>> pickReadWriteServers(Transaction* tr, std::vector<UID> candidates, KeyRangeRef range) {
-	vector<Future<Optional<Value>>> serverListEntries;
+	std::vector<Future<Optional<Value>>> serverListEntries;
 
 	for (const UID id : candidates) {
 		serverListEntries.push_back(tr->get(serverListKeyFor(id)));
 	}
 
-	vector<Optional<Value>> serverListValues = wait(getAll(serverListEntries));
+	std::vector<Optional<Value>> serverListValues = wait(getAll(serverListEntries));
 
 	std::vector<StorageServerInterface> ssis;
 	for (auto& v : serverListValues) {