diff --git a/src/hotkeys.cpp b/src/hotkeys.cpp
index 41b52469c1..2d41f43255 100644
--- a/src/hotkeys.cpp
+++ b/src/hotkeys.cpp
@@ -99,7 +99,7 @@ static uint16_t ParseCode(const char *start, const char *end)
 	assert(start <= end);
 	while (start < end && *start == ' ') start++;
 	while (end > start && *end == ' ') end--;
-	std::string_view str{start, static_cast<size_t>(end - start)};
+	std::string_view str{start, end};
 	for (const auto &kn : _keycode_to_name) {
 		if (StrEqualsIgnoreCase(str, kn.name)) {
 			return kn.keycode;
diff --git a/src/saveload/gamelog_sl.cpp b/src/saveload/gamelog_sl.cpp
index c3354a1d97..fe85af5727 100644
--- a/src/saveload/gamelog_sl.cpp
+++ b/src/saveload/gamelog_sl.cpp
@@ -68,7 +68,7 @@ public:
 		SlObject(lc, this->GetLoadDescription());
 
 		if (IsSavegameVersionBefore(SLV_STRING_GAMELOG)) {
-			static_cast<LoggedChangeRevision *>(lc)->text = StrMakeValid(std::string_view(SlGamelogRevision::revision_text, lengthof(SlGamelogRevision::revision_text)));
+			static_cast<LoggedChangeRevision *>(lc)->text = StrMakeValid(std::string_view(std::begin(SlGamelogRevision::revision_text), std::end(SlGamelogRevision::revision_text)));
 		}
 	}