diff --git a/src/core/or/congestion_control_common.c b/src/core/or/congestion_control_common.c
index 25446621d1..55be5d733b 100644
--- a/src/core/or/congestion_control_common.c
+++ b/src/core/or/congestion_control_common.c
@@ -45,7 +45,7 @@
 #define CWND_INC_PCT_SS_DFLT (100)
 #define CWND_INC_RATE_DFLT (1)
 
-#define CWND_MIN_DFLT (SENDME_INC_DFLT)
+#define CWND_MIN_DFLT (2*SENDME_INC_DFLT)
 #define CWND_MAX_DFLT (INT32_MAX)
 
 #define BWE_SENDME_MIN_DFLT (5)
diff --git a/src/core/or/congestion_control_vegas.c b/src/core/or/congestion_control_vegas.c
index 9b7c471232..f129ecadd6 100644
--- a/src/core/or/congestion_control_vegas.c
+++ b/src/core/or/congestion_control_vegas.c
@@ -30,23 +30,23 @@
 
 /* sbws circs are two hops, so params are based on 2 outbufs of cells */
 #define VEGAS_ALPHA_SBWS_DFLT (2*OUTBUF_CELLS-TLS_RECORD_MAX_CELLS)
-#define VEGAS_BETA_SBWS_DFLT (2*OUTBUF_CELLS)
+#define VEGAS_BETA_SBWS_DFLT (2*OUTBUF_CELLS+TLS_RECORD_MAX_CELLS)
 #define VEGAS_GAMMA_SBWS_DFLT (2*OUTBUF_CELLS)
 #define VEGAS_DELTA_SBWS_DFLT (4*OUTBUF_CELLS)
 #define VEGAS_SSCAP_SBWS_DFLT (400)
 
 /* Exits are three hops, so params are based on 3 outbufs of cells */
-#define VEGAS_ALPHA_EXIT_DFLT (3*OUTBUF_CELLS-TLS_RECORD_MAX_CELLS)
-#define VEGAS_BETA_EXIT_DFLT (3*OUTBUF_CELLS)
+#define VEGAS_ALPHA_EXIT_DFLT (2*OUTBUF_CELLS)
+#define VEGAS_BETA_EXIT_DFLT (4*OUTBUF_CELLS)
 #define VEGAS_GAMMA_EXIT_DFLT (3*OUTBUF_CELLS)
-#define VEGAS_DELTA_EXIT_DFLT (5*OUTBUF_CELLS)
+#define VEGAS_DELTA_EXIT_DFLT (6*OUTBUF_CELLS)
 #define VEGAS_SSCAP_EXIT_DFLT (500)
 
 /* Onion rends are six hops, so params are based on 6 outbufs of cells */
-#define VEGAS_ALPHA_ONION_DFLT (6*OUTBUF_CELLS-TLS_RECORD_MAX_CELLS)
-#define VEGAS_BETA_ONION_DFLT (6*OUTBUF_CELLS)
-#define VEGAS_GAMMA_ONION_DFLT (6*OUTBUF_CELLS)
-#define VEGAS_DELTA_ONION_DFLT (8*OUTBUF_CELLS)
+#define VEGAS_ALPHA_ONION_DFLT (3*OUTBUF_CELLS)
+#define VEGAS_BETA_ONION_DFLT (7*OUTBUF_CELLS)
+#define VEGAS_GAMMA_ONION_DFLT (5*OUTBUF_CELLS)
+#define VEGAS_DELTA_ONION_DFLT (9*OUTBUF_CELLS)
 #define VEGAS_SSCAP_ONION_DFLT (600)
 
 /**