diff --git a/ompi/mca/btl/mvapi/btl_mvapi_endpoint.c b/ompi/mca/btl/mvapi/btl_mvapi_endpoint.c
index 79400a1245..f815eec97e 100644
--- a/ompi/mca/btl/mvapi/btl_mvapi_endpoint.c
+++ b/ompi/mca/btl/mvapi/btl_mvapi_endpoint.c
@@ -681,7 +681,7 @@ int mca_btl_mvapi_endpoint_send(
             rc = OMPI_SUCCESS;
             break;
 
-    case MCA_BTL_IB_WAITING_ACK: 
+        case MCA_BTL_IB_WAITING_ACK: 
         case MCA_BTL_IB_CONNECT_ACK:
 
             BTL_VERBOSE(("Queuing because waiting for ack"));
diff --git a/ompi/mca/btl/self/btl_self_component.c b/ompi/mca/btl/self/btl_self_component.c
index e28cbc2c1f..7b26729f6b 100644
--- a/ompi/mca/btl/self/btl_self_component.c
+++ b/ompi/mca/btl/self/btl_self_component.c
@@ -107,7 +107,7 @@ int mca_btl_self_component_open(void)
     mca_btl_self_component.free_list_max =
         mca_btl_self_param_register_int("free_list_max", -1);
     mca_btl_self_component.free_list_inc =
-        mca_btl_self_param_register_int("free_list_inc", 256);
+        mca_btl_self_param_register_int("free_list_inc", 32);
     mca_btl_self.btl_eager_limit = 
         mca_btl_self_param_register_int("eager_limit", 128*1024);
     mca_btl_self.btl_min_send_size = 
diff --git a/ompi/mca/btl/tcp/btl_tcp_component.c b/ompi/mca/btl/tcp/btl_tcp_component.c
index f2272a1725..c93a4893ea 100644
--- a/ompi/mca/btl/tcp/btl_tcp_component.c
+++ b/ompi/mca/btl/tcp/btl_tcp_component.c
@@ -198,7 +198,7 @@ int mca_btl_tcp_component_open(void)
     mca_btl_tcp_component.tcp_free_list_num =
         mca_btl_tcp_param_register_int ("free_list_num", 8);
     mca_btl_tcp_component.tcp_free_list_max =
-        mca_btl_tcp_param_register_int ("free_list_max", 1024);
+        mca_btl_tcp_param_register_int ("free_list_max", -1);
     mca_btl_tcp_component.tcp_free_list_inc =
         mca_btl_tcp_param_register_int ("free_list_inc", 32);
     mca_btl_tcp_component.tcp_sndbuf =
diff --git a/ompi/mca/pml/ob1/pml_ob1.c b/ompi/mca/pml/ob1/pml_ob1.c
index 00287146fe..f7c74cc96f 100644
--- a/ompi/mca/pml/ob1/pml_ob1.c
+++ b/ompi/mca/pml/ob1/pml_ob1.c
@@ -139,11 +139,10 @@ int mca_pml_ob1_add_procs(ompi_proc_t** procs, size_t nprocs)
                         &mca_pml_ob1.buffers,
                         sizeof(mca_pml_ob1_buffer_t) + mca_pml_ob1.eager_limit,
                         OBJ_CLASS(mca_pml_ob1_buffer_t),
-                        mca_pml_ob1.free_list_num,
+                        0,
                         mca_pml_ob1.free_list_max,
                         mca_pml_ob1.free_list_inc,
                         NULL);
-
     return rc;
 }
 
diff --git a/ompi/mca/pml/ob1/pml_ob1_component.c b/ompi/mca/pml/ob1/pml_ob1_component.c
index 83d0439fb1..3960d52469 100644
--- a/ompi/mca/pml/ob1/pml_ob1_component.c
+++ b/ompi/mca/pml/ob1/pml_ob1_component.c
@@ -81,11 +81,11 @@ int mca_pml_ob1_component_open(void)
     int param, value; 
 
     mca_pml_ob1.free_list_num =
-        mca_pml_ob1_param_register_int("free_list_num", 8);
+        mca_pml_ob1_param_register_int("free_list_num", 4);
     mca_pml_ob1.free_list_max =
         mca_pml_ob1_param_register_int("free_list_max", -1);
     mca_pml_ob1.free_list_inc =
-        mca_pml_ob1_param_register_int("free_list_inc", 256);
+        mca_pml_ob1_param_register_int("free_list_inc", 64);
     mca_pml_ob1.priority =
         mca_pml_ob1_param_register_int("priority", 1);
     mca_pml_ob1.eager_limit =