diff --git a/src/utils/file.c b/src/utils/file.c
index 7d1df554b..7103c8f1d 100644
--- a/src/utils/file.c
+++ b/src/utils/file.c
@@ -489,8 +489,10 @@ fio_disconnect(void)
 		Assert(hdr.cop == FIO_DISCONNECTED);
 		SYS_CHECK(close(fio_stdin));
 		SYS_CHECK(close(fio_stdout));
+		SYS_CHECK(close(fio_stderr));
 		fio_stdin = 0;
 		fio_stdout = 0;
+		fio_stderr = 0;
 		wait_ssh();
 	}
 }
@@ -3403,7 +3405,8 @@ fio_communicate(int in, int out)
 		  case FIO_DISCONNECT:
 			hdr.cop = FIO_DISCONNECTED;
 			IO_CHECK(fio_write_all(out, &hdr, sizeof(hdr)), sizeof(hdr));
-			break;
+			free(buf);
+			return;
 		  case FIO_GET_ASYNC_ERROR:
 			fio_get_async_error_impl(out);
 			break;
diff --git a/src/utils/remote.c b/src/utils/remote.c
index 2bfd24d1e..046ebd818 100644
--- a/src/utils/remote.c
+++ b/src/utils/remote.c
@@ -147,6 +147,9 @@ bool launch_agent(void)
 	ssh_argv[ssh_argc++] = "-o";
 	ssh_argv[ssh_argc++] = "Compression=no";
 
+	ssh_argv[ssh_argc++] = "-o";
+	ssh_argv[ssh_argc++] = "ControlMaster=no";
+
 	ssh_argv[ssh_argc++] = "-o";
 	ssh_argv[ssh_argc++] = "LogLevel=error";