diff --git a/fdbserver/VFSAsync.h b/fdbserver/VFSAsync.h
index 77aea71348..aee3544233 100644
--- a/fdbserver/VFSAsync.h
+++ b/fdbserver/VFSAsync.h
@@ -68,11 +68,13 @@ struct VFSAsyncFile {
 		// Error code is only checked for non-zero because the SQLite API error code after an injected error
 		// may not match the error code returned by VFSAsyncFile when the inject error occurred.
 		bool e = g_network->global(INetwork::enSQLiteInjectedError) != (flowGlobalType)0;
+		bool f = g_simulator.checkInjectedCorruption();
 		TraceEvent("VFSCheckInjectedError")
-		    .detail("Found", e)
+		    .detail("InjectedIOError", e)
+		    .detail("InjectedCorruption", f)
 		    .detail("ErrorCode", (int64_t)g_network->global(INetwork::enSQLiteInjectedError))
 		    .backtrace();
-		return e || (g_network->isSimulated() && g_simulator.checkInjectedCorruption());
+		return e || f;
 	}
 
 	uint32_t* const pLockCount; // +1 for each SHARED_LOCK, or 1+X_COUNT for lock level X
diff --git a/fdbserver/workloads/TargetedKill.actor.cpp b/fdbserver/workloads/TargetedKill.actor.cpp
index cb3d0145c5..3d58f82a93 100644
--- a/fdbserver/workloads/TargetedKill.actor.cpp
+++ b/fdbserver/workloads/TargetedKill.actor.cpp
@@ -50,7 +50,6 @@ struct TargetedKillWorkload : TestWorkload {
 	std::string description() const override { return "TargetedKillWorkload"; }
 	Future<Void> setup(Database const& cx) override { return Void(); }
 	Future<Void> start(Database const& cx) override {
-		TraceEvent("StartTargetedKill").detail("Enabled", enabled);
 		if (enabled)
 			return assassin(cx, this);
 		return Void();
@@ -142,13 +141,10 @@ struct TargetedKillWorkload : TestWorkload {
 			for (j = 0; j < storageServers.size(); j++) {
 				StorageServerInterface ssi = storageServers[s];
 				machine = ssi.address();
-				if (machine != self->dbInfo->get().clusterInterface.getWorkers.getEndpoint().getPrimaryAddress()) {
+				if (machine != ccAddr) {
 					TraceEvent("IsolatedMark").detail("TargetedMachine", machine).detail("Role", self->machineToKill);
 					wait(self->killEndpoint(workers, machine, cx, self));
 					killed++;
-					TraceEvent("SentKillEndpoint")
-					    .detail("Killed", killed)
-					    .detail("NumKillStorages", self->numKillStorages);
 					if (killed == self->numKillStorages)
 						return Void();
 				}