diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/count/CountRequest.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/count/CountRequest.java
index e2b25f50c1b..d2bf0424768 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/count/CountRequest.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/count/CountRequest.java
@@ -100,7 +100,7 @@ public class CountRequest extends BroadcastOperationRequest {
         return this;
     }
 
-    @Override protected void beforeLocalFork() {
+    @Override protected void beforeStart() {
         if (querySourceUnsafe) {
             querySource = Arrays.copyOfRange(querySource, querySourceOffset, querySourceOffset + querySourceLength);
             querySourceOffset = 0;
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/mlt/MoreLikeThisRequest.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/mlt/MoreLikeThisRequest.java
index da3e868bc11..e45fe77b301 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/mlt/MoreLikeThisRequest.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/mlt/MoreLikeThisRequest.java
@@ -325,7 +325,7 @@ public class MoreLikeThisRequest implements ActionRequest {
      * more like this documents.
      */
     public MoreLikeThisRequest searchSource(SearchSourceBuilder sourceBuilder) {
-        BytesStream bos = sourceBuilder.buildAsUnsafeBytes(Requests.CONTENT_TYPE);
+        BytesStream bos = sourceBuilder.buildAsBytesStream(Requests.CONTENT_TYPE);
         this.searchSource = bos.underlyingBytes();
         this.searchSourceOffset = 0;
         this.searchSourceLength = bos.size();
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/SearchRequest.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/SearchRequest.java
index 329004480cd..f14b3080f45 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/SearchRequest.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/search/SearchRequest.java
@@ -261,11 +261,11 @@ public class SearchRequest implements ActionRequest {
      * The source of the search request.
      */
     public SearchRequest source(SearchSourceBuilder sourceBuilder) {
-        BytesStream bos = sourceBuilder.buildAsUnsafeBytes(Requests.CONTENT_TYPE);
+        BytesStream bos = sourceBuilder.buildAsBytesStream(Requests.CONTENT_TYPE);
         this.source = bos.underlyingBytes();
         this.sourceOffset = 0;
         this.sourceLength = bos.size();
-        this.sourceUnsafe = true;
+        this.sourceUnsafe = false;
         return this;
     }
 
@@ -356,11 +356,11 @@ public class SearchRequest implements ActionRequest {
             extraSource = null;
             return this;
         }
-        BytesStream bos = sourceBuilder.buildAsUnsafeBytes(Requests.CONTENT_TYPE);
+        BytesStream bos = sourceBuilder.buildAsBytesStream(Requests.CONTENT_TYPE);
         this.extraSource = bos.underlyingBytes();
         this.extraSourceOffset = 0;
         this.extraSourceLength = bos.size();
-        this.extraSourceUnsafe = true;
+        this.extraSourceUnsafe = false;
         return this;
     }
 
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequest.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequest.java
index 605bc2a2ffe..f3fe492d3aa 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequest.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/broadcast/BroadcastOperationRequest.java
@@ -96,6 +96,10 @@ public abstract class BroadcastOperationRequest implements ActionRequest {
         return operationThreading(BroadcastOperationThreading.fromString(operationThreading, this.operationThreading));
     }
 
+    protected void beforeStart() {
+
+    }
+
     protected void beforeLocalFork() {
 
     }
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastOperationAction.java b/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastOperationAction.java
index 44571f447ec..d8bd9cf0aa2 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastOperationAction.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/action/support/broadcast/TransportBroadcastOperationAction.java
@@ -156,6 +156,7 @@ public abstract class TransportBroadcastOperationAction<Request extends Broadcas
                 // no shards
                 listener.onResponse(newResponse(request, new AtomicReferenceArray(0), clusterState));
             }
+            request.beforeStart();
             // count the local operations, and perform the non local ones
             int localOperations = 0;
             for (final ShardIterator shardIt : shardsIts) {
diff --git a/modules/elasticsearch/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java b/modules/elasticsearch/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java
index c94529a774f..552ed9ec1c1 100644
--- a/modules/elasticsearch/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java
+++ b/modules/elasticsearch/src/main/java/org/elasticsearch/search/builder/SearchSourceBuilder.java
@@ -495,7 +495,7 @@ public class SearchSourceBuilder implements ToXContent {
         }
     }
 
-    public BytesStream buildAsUnsafeBytes(XContentType contentType) throws SearchSourceBuilderException {
+    public BytesStream buildAsBytesStream(XContentType contentType) throws SearchSourceBuilderException {
         try {
             XContentBuilder builder = XContentFactory.contentBuilder(contentType);
             toXContent(builder, ToXContent.EMPTY_PARAMS);