diff --git a/Common/Net/HTTPNaettRequest.cpp b/Common/Net/HTTPNaettRequest.cpp
index 4bbb2bd8ed..8161e6d92a 100644
--- a/Common/Net/HTTPNaettRequest.cpp
+++ b/Common/Net/HTTPNaettRequest.cpp
@@ -40,7 +40,12 @@ struct NaettBodySink {
 // while a callback might still be in flight, and neither can these, so both are deliberately
 // leaked. Allocated with new and never deleted, so it can't be destroyed out from under a late
 // callback during static destruction either.
-static std::vector<std::unique_ptr<NaettBodySink>> *g_abandonedSinks = new std::vector<std::unique_ptr<NaettBodySink>>();
+static std::vector<std::unique_ptr<NaettBodySink>> *g_abandonedSinks = nullptr;
+
+void HTTPSShutdown() {
+	delete g_abandonedSinks;
+	g_abandonedSinks = nullptr;
+}
 
 int HTTPSRequest::WriteBodyThunk(const void *source, int bytes, void *userData) {
 	NaettBodySink *sink = (NaettBodySink *)userData;
@@ -141,6 +146,9 @@ void HTTPSRequest::Join() {
 		WARN_LOG(Log::HTTP, "Abandoning an unfinished request to '%s' - shutting down", url_.c_str());
 		if (sink_) {
 			sink_->cancelled = true;
+			if (!g_abandonedSinks) {
+				g_abandonedSinks = new std::vector<std::unique_ptr<NaettBodySink>>();
+			}
 			g_abandonedSinks->push_back(std::move(sink_));
 		}
 		res_ = nullptr;
diff --git a/Common/Net/HTTPNaettRequest.h b/Common/Net/HTTPNaettRequest.h
index 5c731678a5..37ade8521a 100644
--- a/Common/Net/HTTPNaettRequest.h
+++ b/Common/Net/HTTPNaettRequest.h
@@ -14,6 +14,8 @@ namespace http {
 
 struct NaettBodySink;
 
+void HTTPSShutdown();
+
 // Really an asynchronous request.
 class HTTPSRequest : public Request {
 public:
diff --git a/Common/Net/Resolve.cpp b/Common/Net/Resolve.cpp
index e43192ee9d..60321e2420 100644
--- a/Common/Net/Resolve.cpp
+++ b/Common/Net/Resolve.cpp
@@ -15,6 +15,7 @@
 #include "Common/Net/Resolve.h"
 
 #ifndef HTTPS_NOT_AVAILABLE
+#include "Common/Net/HTTPNaettRequest.h"
 #include "ext/naett-lib/naett.h"
 // Note: PPSSPP_PLATFORM(LINUX) is also set on Android, which needs no loader.
 #if PPSSPP_PLATFORM(LINUX) && !PPSSPP_PLATFORM(ANDROID)
@@ -68,6 +69,9 @@ bool HTTPSAvailable() {
 }
 
 void Shutdown() {
+#ifndef HTTPS_NOT_AVAILABLE
+	http::HTTPSShutdown();
+#endif
 #ifdef _WIN32
 	if (g_wsaInitialized) {
 		WSACleanup();
diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index 420e3061a5..504890ff10 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -37,6 +37,7 @@
 #include <memory>
 #include <mutex>
 #include <thread>
+#include <vector>
 
 
 #include "ext/imgui/imgui.h"
@@ -872,15 +873,12 @@ bool CreateGlobalPipelines();
 
 // TODO: Add faster special case for channels == 2.
 static void NativeMixWrapper(float *dest, int framesToWrite, int sampleRateHz, void *userdata) {
-	static int16_t *buffer;
-	static int bufSize;
-	if (bufSize < framesToWrite * 2) {
-		// This one leaks on exit. Oh well.
-		buffer = new int16_t[framesToWrite * 2];
-		bufSize = framesToWrite * 2;
+	static std::vector<int16_t> buffer;
+	if ((int)buffer.size() < framesToWrite * 2) {
+		buffer.resize(framesToWrite * 2);
 	}
 
-	NativeMix(buffer, framesToWrite, sampleRateHz, userdata);
+	NativeMix(buffer.data(), framesToWrite, sampleRateHz, userdata);
 
 	for (int i = 0; i < framesToWrite * 2; i++) {
 		dest[i] = (float)buffer[i] * (float)(1.0f / 32767.0f);
diff --git a/Windows/Debugger/Debugger_Disasm.cpp b/Windows/Debugger/Debugger_Disasm.cpp
index 63d54d16de..199c272ae5 100644
--- a/Windows/Debugger/Debugger_Disasm.cpp
+++ b/Windows/Debugger/Debugger_Disasm.cpp
@@ -195,6 +195,7 @@ CDisasm::~CDisasm()
 	delete threadList;
 	delete stackTraceView;
 	delete moduleList;
+	delete watchList_;
 }
 
 void CDisasm::step(CPUStepType stepType) {