diff --git a/src/main/java/org/elasticsearch/license/plugin/action/get/GetLicenseRequest.java b/src/main/java/org/elasticsearch/license/plugin/action/get/GetLicenseRequest.java
index 86674843d7a..e78fb7fdcfc 100644
--- a/src/main/java/org/elasticsearch/license/plugin/action/get/GetLicenseRequest.java
+++ b/src/main/java/org/elasticsearch/license/plugin/action/get/GetLicenseRequest.java
@@ -27,12 +27,12 @@ public class GetLicenseRequest extends MasterNodeReadOperationRequest<GetLicense
     @Override
     public void readFrom(StreamInput in) throws IOException {
         super.readFrom(in);
-        readLocal(in, Version.V_1_0_0_RC2);
+        readLocal(in);
     }
 
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
-        writeLocal(out, Version.V_1_0_0_RC2);
+        writeLocal(out);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/org/elasticsearch/license/plugin/action/put/TransportPutLicenseAction.java b/src/main/java/org/elasticsearch/license/plugin/action/put/TransportPutLicenseAction.java
index 3f9557aa711..1649eac1a7c 100644
--- a/src/main/java/org/elasticsearch/license/plugin/action/put/TransportPutLicenseAction.java
+++ b/src/main/java/org/elasticsearch/license/plugin/action/put/TransportPutLicenseAction.java
@@ -38,7 +38,7 @@ public class TransportPutLicenseAction extends TransportMasterNodeOperationActio
 
     @Override
     protected String executor() {
-        return ThreadPool.Names.SAME;
+        return ThreadPool.Names.MANAGEMENT;
     }
 
     @Override
diff --git a/src/main/java/org/elasticsearch/license/plugin/rest/RestGetLicenseAction.java b/src/main/java/org/elasticsearch/license/plugin/rest/RestGetLicenseAction.java
index 2327ebb0b4b..96e131706d2 100644
--- a/src/main/java/org/elasticsearch/license/plugin/rest/RestGetLicenseAction.java
+++ b/src/main/java/org/elasticsearch/license/plugin/rest/RestGetLicenseAction.java
@@ -59,7 +59,9 @@ public class RestGetLicenseAction extends BaseRestHandler {
     public void handleRequest(final RestRequest request, final RestChannel channel, final Client client) {
         final Map<String, String> overrideParams = ImmutableMap.of(ESLicenses.OMIT_SIGNATURE, "true");
         final ToXContent.Params params = new ToXContent.DelegatingMapParams(overrideParams, request);
-        client.admin().cluster().execute(GetLicenseAction.INSTANCE, new GetLicenseRequest(), new RestBuilderListener<GetLicenseResponse>(channel) {
+        GetLicenseRequest getLicenseRequest = new GetLicenseRequest();
+        getLicenseRequest.local(request.paramAsBoolean("local", getLicenseRequest.local()));
+        client.admin().cluster().execute(GetLicenseAction.INSTANCE, getLicenseRequest, new RestBuilderListener<GetLicenseResponse>(channel) {
             @Override
             public RestResponse buildResponse(GetLicenseResponse response, XContentBuilder builder) throws Exception {
                 ESLicenses.toXContent(response.licenses(), builder, params);