diff --git a/Common/Data/Encoding/Base64.cpp b/Common/Data/Encoding/Base64.cpp
index 5d7e4512fb..6c82766338 100644
--- a/Common/Data/Encoding/Base64.cpp
+++ b/Common/Data/Encoding/Base64.cpp
@@ -2,7 +2,7 @@
 
 // TODO: This is a simple but not very efficient implementation.
 std::string Base64Encode(const uint8_t *p, size_t sz) {
-	const char digits[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+	static const char digits[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
 	size_t unpaddedLength = (4 * sz + 2) / 3;
 	std::string result;
@@ -35,7 +35,7 @@ std::string Base64Encode(const uint8_t *p, size_t sz) {
 }
 
 std::vector<uint8_t> Base64Decode(const char *s, size_t sz) {
-	const uint8_t lookup[256] = {
+	static const uint8_t lookup[256] = {
 		255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
 		255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,
 		255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255,  62,  63,  62, 255,  63,
diff --git a/Core/Debugger/WebSocket/MemorySubscriber.cpp b/Core/Debugger/WebSocket/MemorySubscriber.cpp
index d6f078fb7a..8adc6fec5b 100644
--- a/Core/Debugger/WebSocket/MemorySubscriber.cpp
+++ b/Core/Debugger/WebSocket/MemorySubscriber.cpp
@@ -132,19 +132,16 @@ void WebSocketMemoryRead(DebuggerRequest &req) {
 		return req.Fail("CPU not started");
 
 	uint32_t addr;
-	if (!req.ParamU32("address", &addr)) {
+	if (!req.ParamU32("address", &addr))
 		return;
-	}
 	uint32_t size;
-	if (!req.ParamU32("size", &size)) {
+	if (!req.ParamU32("size", &size))
 		return;
-	}
 
-	if (!Memory::IsValidAddress(addr)) {
+	if (!Memory::IsValidAddress(addr))
 		return req.Fail("Invalid address");
-	} else if (!Memory::IsValidRange(addr, size)) {
+	else if (!Memory::IsValidRange(addr, size))
 		return req.Fail("Invalid size");
-	}
 
 	JsonWriter &json = req.Respond();
 	// Start a value without any actual data yet...
@@ -309,22 +306,19 @@ void WebSocketMemoryWrite(DebuggerRequest &req) {
 		return req.Fail("CPU not started");
 
 	uint32_t addr;
-	if (!req.ParamU32("address", &addr)) {
+	if (!req.ParamU32("address", &addr))
 		return;
-	}
 	std::string encoded;
-	if (!req.ParamString("base64", &encoded)) {
+	if (!req.ParamString("base64", &encoded))
 		return;
-	}
 
 	std::vector<uint8_t> value = Base64Decode(&encoded[0], encoded.size());
 	uint32_t size = (uint32_t)value.size();
 
-	if (!Memory::IsValidAddress(addr)) {
+	if (!Memory::IsValidAddress(addr))
 		return req.Fail("Invalid address");
-	} else if (value.size() != (size_t)size || !Memory::IsValidRange(addr, size)) {
+	else if (value.size() != (size_t)size || !Memory::IsValidRange(addr, size))
 		return req.Fail("Invalid size");
-	}
 
 	Memory::MemcpyUnchecked(addr, &value[0], size);
 	req.Respond();