diff --git a/js/redactor-osticket.js b/js/redactor-osticket.js
index 486cadd7281d2467a437dbb3af9b6cde0ab3b1a1..3e5f3fc06276eadd6c9f1e184e64a65932c6f70d 100644
--- a/js/redactor-osticket.js
+++ b/js/redactor-osticket.js
@@ -122,6 +122,9 @@ $(function() {
                   .attr('height',img.clientHeight);
             html = html.replace(before, img.outerHTML);
         });
+        // Drop the placeholder text if found in the box
+        // DELME: When this is fixed upstream in Redactor
+        html = html.replace(/<span class="redactor_placeholder[^<]+<\/span>/, '');
         return html;
     },
     redact = function(el) {
diff --git a/setup/cli/modules/deploy.php b/setup/cli/modules/deploy.php
index 97d3e1abb7b02f4bd3c51284f0d128d88aacd7bb..aa123bfcb1de9524ddb3b9bf3d291450eb866d62 100644
--- a/setup/cli/modules/deploy.php
+++ b/setup/cli/modules/deploy.php
@@ -127,7 +127,9 @@ class Deployment extends Unpacker {
             // Clean everything but include folder first
             $this->clean($root, $this->destination, -1,
                 array($include, "setup/"));
-            $this->clean("$root/include", $include, -1);
+            $this->clean("$root/include", $include, -1,
+                array("ost-config.php","settings.php","plugins/",
+                "*/.htaccess"));
         }
     }
 }