diff --git a/appengine/app.yaml b/appengine/app.yaml
index 36315433e..92b054115 100644
--- a/appengine/app.yaml
+++ b/appengine/app.yaml
@@ -71,29 +71,36 @@ handlers:
 # Storage API.
 - url: /storage
   script: storage.py
+  secure: always
 - url: /storage\.js
   static_files: storage.js
   upload: storage\.js
+  secure: always
 
 # Blockly files.
 - url: /static
   static_dir: static
+  secure: always
 
 # Closure library for uncompiled Blockly.
 - url: /closure-library-read-only
   static_dir: closure-library-read-only
+  secure: always
 
 # Redirect for root directory.
 - url: /
   script: index_redirect.py
+  secure: always
 
 # Favicon.
 - url: /favicon\.ico
   static_files: favicon.ico
   upload: favicon\.ico
+  secure: always
 
 # robot.txt
 - url: /robots\.txt
   static_files: robots.txt
   upload: robots\.txt
+  secure: always
 
diff --git a/apps/blockfactory/factory.js b/apps/blockfactory/factory.js
index d32a5124a..d34493834 100644
--- a/apps/blockfactory/factory.js
+++ b/apps/blockfactory/factory.js
@@ -345,11 +345,11 @@ function updateGenerator() {
         break;
     }
   }
-  code.push("  // TODO: Assemble ' + language + ' into code variable.");
+  code.push("  // TODO: Assemble " + language + " into code variable.");
   code.push("  var code = \'...\';");
   if (rootBlock.getTitleValue('CONNECTIONS') == 'LEFT') {
     code.push("  // TODO: Change ORDER_NONE to the correct strength.");
-    code.push("  return [code, Blockly.' + language + '.ORDER_NONE];");
+    code.push("  return [code, Blockly." + language + ".ORDER_NONE];");
   } else {
     code.push("  return code;");
   }