diff --git a/ompi/mca/btl/tcp/btl_tcp.c b/ompi/mca/btl/tcp/btl_tcp.c
index fd986c5f41..bf9e4c9ffa 100644
--- a/ompi/mca/btl/tcp/btl_tcp.c
+++ b/ompi/mca/btl/tcp/btl_tcp.c
@@ -289,6 +289,7 @@ mca_btl_base_descriptor_t* mca_btl_tcp_prepare_src(
     frag->base.des_dst = NULL;
     frag->base.des_dst_cnt = 0;
     frag->base.des_flags = 0;
+    *size = max_data;
     return &frag->base;
 }
 
diff --git a/ompi/mca/btl/tcp/btl_tcp_component.c b/ompi/mca/btl/tcp/btl_tcp_component.c
index bb1556e374..6853ae102a 100644
--- a/ompi/mca/btl/tcp/btl_tcp_component.c
+++ b/ompi/mca/btl/tcp/btl_tcp_component.c
@@ -218,7 +218,7 @@ int mca_btl_tcp_component_open(void)
     mca_btl_tcp_module.super.btl_max_rdma_size = 
         mca_btl_tcp_param_register_int("max_rdma_size", INT_MAX); 
     mca_btl_tcp_module.super.btl_flags  = 
-        mca_btl_tcp_param_register_int("flags", MCA_BTL_FLAGS_RDMA); 
+        mca_btl_tcp_param_register_int("flags", MCA_BTL_FLAGS_RDMA|MCA_BTL_FLAGS_SEND_INPLACE); 
     return OMPI_SUCCESS;
 }