diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.js b/config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.js
index ce7089778d..16484b12e6 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/upload/upload.post.js
@@ -369,15 +369,10 @@ function main()
    }
    catch (e)
    {
-      try
-      {
-         formdata.cleanup();
-      }
-      catch (ce)
-      {
-         // NOTE: ignore
-      }
-
+      // NOTE: Do not clean formdata temp files to allow for retries. It's possible for a temp file
+      //       to remain if max retry attempts are made, but this is rare, so leave to usual temp
+      //       file cleanup.
+      
       // capture exception, annotate it accordingly and re-throw
       if (e.message && e.message.indexOf("org.alfresco.service.cmr.usage.ContentQuotaException") == 0)
       {
diff --git a/source/java/org/alfresco/repo/web/scripts/subscriptions/AbstractSubscriptionServiceWebScript.java b/source/java/org/alfresco/repo/web/scripts/subscriptions/AbstractSubscriptionServiceWebScript.java
index 916b01a4d9..7896e3aefe 100644
--- a/source/java/org/alfresco/repo/web/scripts/subscriptions/AbstractSubscriptionServiceWebScript.java
+++ b/source/java/org/alfresco/repo/web/scripts/subscriptions/AbstractSubscriptionServiceWebScript.java
@@ -38,6 +38,7 @@ import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.ParseException;
 import org.springframework.extensions.webscripts.AbstractWebScript;
+import org.springframework.extensions.webscripts.Format;
 import org.springframework.extensions.webscripts.WebScriptException;
 import org.springframework.extensions.webscripts.WebScriptRequest;
 import org.springframework.extensions.webscripts.WebScriptResponse;
@@ -79,6 +80,7 @@ public abstract class AbstractSubscriptionServiceWebScript extends AbstractWebSc
             if (obj instanceof JSONObject || obj instanceof JSONArray)
             {
                 res.setContentEncoding(Charset.defaultCharset().displayName());
+                res.setContentType(Format.JSON.mimetype() + ";charset=UTF-8");
 
                 Writer writer = res.getWriter();
                 if (obj instanceof JSONObject)
diff --git a/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowModelBuilder.java b/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowModelBuilder.java
index cd904e8018..9fbfc162c3 100644
--- a/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowModelBuilder.java
+++ b/source/java/org/alfresco/repo/web/scripts/workflow/WorkflowModelBuilder.java
@@ -439,7 +439,7 @@ public class WorkflowModelBuilder
                         if (constraint instanceof ListOfValuesConstraint)
                         {
                             ListOfValuesConstraint listConstraint = (ListOfValuesConstraint) constraint;
-                            String label = listConstraint.getDisplayLabel(entry.getValue().toString());
+                            String label = listConstraint.getDisplayLabel(String.valueOf(entry.getValue()));
                             return new Pair<String, String>(propName, label);
                         }
                     }