diff --git a/src/iperf_api.c b/src/iperf_api.c
index 262adbc2e..a8caa70aa 100644
--- a/src/iperf_api.c
+++ b/src/iperf_api.c
@@ -4319,6 +4319,7 @@ iperf_print_results(struct iperf_test *test)
                 }
                 if (test->server_output_text) {
                     iperf_printf(test, "\nServer output:\n%s\n", test->server_output_text);
+	            free(test->server_output_text);
                     test->server_output_text = NULL;
                 }
             }
diff --git a/src/iperf_client_api.c b/src/iperf_client_api.c
index d2542f717..67b05cc69 100644
--- a/src/iperf_client_api.c
+++ b/src/iperf_client_api.c
@@ -148,6 +148,11 @@ iperf_create_streams(struct iperf_test *test, int sender)
 		    i_errno = IESETCONGESTION;
 		    return -1;
 		}
+	        if (test->congestion_used) {
+	          if (test->debug)
+	            printf("Overriding existing congestion algorithm: %s\n", test->congestion_used);
+	          free(test->congestion_used);
+	        }
                 // Set actual used congestion alg, or set to unknown if could not get it
                 if (rc < 0)
                     test->congestion_used = strdup("unknown");