diff --git a/fdbrpc/AsyncFileCached.actor.h b/fdbrpc/AsyncFileCached.actor.h
index aca82693c2..c93a7b0861 100644
--- a/fdbrpc/AsyncFileCached.actor.h
+++ b/fdbrpc/AsyncFileCached.actor.h
@@ -230,8 +230,6 @@ public:
 		return filename;
 	}
 
-	std::vector<AFCPage*> const& getFlushable() { return flushable; }
-
 	void setRateControl(Reference<IRateControl> const& rc) override { rateControl = rc; }
 
 	Reference<IRateControl> const& getRateControl() override { return rateControl; }
@@ -252,8 +250,8 @@ public:
 			}
 
 			auto f = quiesce();
-			//TraceEvent("AsyncFileCachedDel").detail("Filename", filename)
-			//	.detail("Refcount", debugGetReferenceCount()).detail("CanDie", f.isReady()).backtrace();
+			TraceEvent("AsyncFileCachedDel").detail("Filename", filename)
+				.detail("Refcount", debugGetReferenceCount()).detail("CanDie", f.isReady()).backtrace();
 			if (f.isReady())
 				delete this;
 			else
@@ -303,7 +301,7 @@ private:
 	AsyncFileCached(Reference<IAsyncFile> uncached, const std::string& filename, int64_t length,
 	                Reference<EvictablePageCache> pageCache)
 	  : uncached(uncached), filename(filename), length(length), prevLength(length), pageCache(pageCache),
-	    currentTruncate(Void()), currentTruncateSize(0), rateControl(nullptr) {
+	    currentTruncate(Void()), currentTruncateSize(0) {
 		if( !g_network->isSimulated() ) {
 			countFileCacheWrites.init(LiteralStringRef("AsyncFile.CountFileCacheWrites"), filename);
 			countFileCacheReads.init(LiteralStringRef("AsyncFile.CountFileCacheReads"), filename);
diff --git a/fdbserver/KeyValueStoreSQLite.actor.cpp b/fdbserver/KeyValueStoreSQLite.actor.cpp
index be43041686..f67894cfe9 100644
--- a/fdbserver/KeyValueStoreSQLite.actor.cpp
+++ b/fdbserver/KeyValueStoreSQLite.actor.cpp
@@ -1897,6 +1897,7 @@ private:
 			dbFile->setRateControl({});
 			rc->wakeWaiters();
 		}
+		dbFile.clear();
 
 		if(walFile && walFile->getRateControl()) {
 			TraceEvent(SevDebug, "KeyValueStoreSQLiteShutdownRateControl").detail("Filename", walFile->getFilename());
@@ -1904,6 +1905,7 @@ private:
 			walFile->setRateControl({});
 			rc->wakeWaiters();
 		}
+		walFile.clear();
 	}
 
 	ACTOR static Future<Void> stopOnError( KeyValueStoreSQLite* self ) {