diff --git a/Parse/Internal/Command/ParseCommand.cs b/Parse/Internal/Command/ParseCommand.cs
index d108e61e..cfbdf672 100644
--- a/Parse/Internal/Command/ParseCommand.cs
+++ b/Parse/Internal/Command/ParseCommand.cs
@@ -53,7 +53,6 @@ public ParseCommand(string relativeUri,
       // TODO (richardross): Inject configuration instead of using shared static here.
       Headers = new List<KeyValuePair<string, string>> {
         new KeyValuePair<string, string>("X-Parse-Application-Id", ParseClient.CurrentConfiguration.ApplicationId),
-        new KeyValuePair<string, string>("X-Parse-Windows-Key", ParseClient.CurrentConfiguration.WindowsKey),
         new KeyValuePair<string, string>("X-Parse-Client-Version", ParseClient.VersionString),
         new KeyValuePair<string, string>("X-Parse-Installation-Id", ParseClient.InstallationId.ToString())
       };
diff --git a/Parse/Internal/HttpClient/Android/HttpClient.Android.cs b/Parse/Internal/HttpClient/Android/HttpClient.Android.cs
index be1c04c0..8c0fc8e6 100644
--- a/Parse/Internal/HttpClient/Android/HttpClient.Android.cs
+++ b/Parse/Internal/HttpClient/Android/HttpClient.Android.cs
@@ -95,7 +95,7 @@ public Task<Tuple<HttpStatusCode, string>> ExecuteAsync(HttpRequest httpRequest,
 
       return uploadTask.Safe().OnSuccess(_ => {
         return request.GetResponseAsync();
-      }).Unwrap().OnSuccess(t => {
+      }).Unwrap().ContinueWith(t => {
         // Handle canceled
         cancellationToken.ThrowIfCancellationRequested();
 
diff --git a/Parse/Internal/HttpClient/NetFx45/HttpClient.NetFx45.cs b/Parse/Internal/HttpClient/NetFx45/HttpClient.NetFx45.cs
index dda8ef24..6939fc7c 100644
--- a/Parse/Internal/HttpClient/NetFx45/HttpClient.NetFx45.cs
+++ b/Parse/Internal/HttpClient/NetFx45/HttpClient.NetFx45.cs
@@ -95,7 +95,7 @@ public Task<Tuple<HttpStatusCode, string>> ExecuteAsync(HttpRequest httpRequest,
 
       return uploadTask.Safe().OnSuccess(_ => {
         return request.GetResponseAsync();
-      }).Unwrap().OnSuccess(t => {
+      }).Unwrap().ContinueWith(t => {
         // Handle canceled
         cancellationToken.ThrowIfCancellationRequested();
 
diff --git a/Parse/Internal/HttpClient/Phone/HttpClient.Phone.cs b/Parse/Internal/HttpClient/Phone/HttpClient.Phone.cs
index 6420a669..cef24e6f 100644
--- a/Parse/Internal/HttpClient/Phone/HttpClient.Phone.cs
+++ b/Parse/Internal/HttpClient/Phone/HttpClient.Phone.cs
@@ -104,8 +104,7 @@ public Task<Tuple<HttpStatusCode, string>> ExecuteAsync(HttpRequest httpRequest,
             request.BeginGetResponse,
             request.EndGetResponse,
             TaskCreationOptions.None);
-      }).Unwrap()
-      .ContinueWith(t => {
+      }).Unwrap().ContinueWith(t => {
         // Handle canceled
         cancellationToken.ThrowIfCancellationRequested();
 
diff --git a/Parse/Internal/HttpClient/WinRT/HttpClient.WinRT.cs b/Parse/Internal/HttpClient/WinRT/HttpClient.WinRT.cs
index dda8ef24..6939fc7c 100644
--- a/Parse/Internal/HttpClient/WinRT/HttpClient.WinRT.cs
+++ b/Parse/Internal/HttpClient/WinRT/HttpClient.WinRT.cs
@@ -95,7 +95,7 @@ public Task<Tuple<HttpStatusCode, string>> ExecuteAsync(HttpRequest httpRequest,
 
       return uploadTask.Safe().OnSuccess(_ => {
         return request.GetResponseAsync();
-      }).Unwrap().OnSuccess(t => {
+      }).Unwrap().ContinueWith(t => {
         // Handle canceled
         cancellationToken.ThrowIfCancellationRequested();
 
diff --git a/Parse/Internal/HttpClient/iOS/HttpClient.iOS.cs b/Parse/Internal/HttpClient/iOS/HttpClient.iOS.cs
index 19d7e6c4..6b9d38a3 100644
--- a/Parse/Internal/HttpClient/iOS/HttpClient.iOS.cs
+++ b/Parse/Internal/HttpClient/iOS/HttpClient.iOS.cs
@@ -96,7 +96,7 @@ public Task<Tuple<HttpStatusCode, string>> ExecuteAsync(HttpRequest httpRequest,
 
       return uploadTask.Safe().OnSuccess(_ => {
         return request.GetResponseAsync();
-      }).Unwrap().OnSuccess(t => {
+      }).Unwrap().ContinueWith(t => {
         // Handle canceled
         cancellationToken.ThrowIfCancellationRequested();