diff --git a/include/ajax.tickets.php b/include/ajax.tickets.php
index 2ae54c819c1ab870fb58cce3de5ce42e1290bde9..74bbd13e55ee3d5e94023af5f239a88fd126678b 100644
--- a/include/ajax.tickets.php
+++ b/include/ajax.tickets.php
@@ -737,8 +737,7 @@ class TicketsAjaxAPI extends AjaxController {
             if (!$thisstaff->hasPerm(Ticket::PERM_DELETE, false))
                 $errors['err'] = sprintf(
                         __('You do not have permission %s'),
-                        __('to delete tickets'))
-
+                        __('to delete tickets'));
 
             if ($_POST && !$errors) {
                 foreach ($_POST['tids'] as $tid) {
diff --git a/include/class.thread.php b/include/class.thread.php
index 90ae737c692161667f6c1eae01ae2040887bb4a1..07073b11cacd338c4379599f862abc09db661ec8 100644
--- a/include/class.thread.php
+++ b/include/class.thread.php
@@ -2176,7 +2176,7 @@ class ThreadEntryBody /* extends SplString */ {
 
     static function clean($text, $format=null) {
         global $cfg;
-        $format = $format ?: ($cfg->isHtmlThreadEnabled() ? 'html' : 'text');
+        $format = $format ?: ($cfg->isRichTextEnabled() ? 'html' : 'text');
         $body = static::fromFormattedText($text, $format);
         return $body->getClean();
     }
diff --git a/scp/tickets.php b/scp/tickets.php
index 030db306b95036aee783d6aa16d1110f823ef599..7e8f027dce8052999cf9ed87b0e275d1080197a1 100644
--- a/scp/tickets.php
+++ b/scp/tickets.php
@@ -337,7 +337,7 @@ if($_POST && !$errors):
                         unset($_SESSION[':form-data']);
                     } elseif(!$errors['err']) {
                         $errors['err']=sprintf('%s %s',
-                            __('Unable to create the ticket.',
+                            __('Unable to create the ticket.'),
                             __('Correct any errors below and try again.'));
                     }
                 }
diff --git a/setup/inc/class.installer.php b/setup/inc/class.installer.php
index d922eab1b234a4c340a10449082db9acd4f3a3da..b382aa0f6b71cf5326574a3bf4e27172fcecd54a 100644
--- a/setup/inc/class.installer.php
+++ b/setup/inc/class.installer.php
@@ -64,7 +64,7 @@ class Installer extends SetupWizard {
         $vars = array_map('trim', $vars);
 
         if(!Validator::process($f,$vars,$this->errors) && !$this->errors['err'])
-            $errors['err'] = sprintf('%s — %s',
+            $this->errors['err'] = sprintf('%s — %s',
                 __('Missing or invalid data'),
                 __('Correct any errors below and try again'));
 
diff --git a/setup/test/tests/stubs.php b/setup/test/tests/stubs.php
index 6bcbf3110d835657c99f9383807a3b6aa7b0a3a3..657e891bd16913433a16761066a8d90a417abd52 100644
--- a/setup/test/tests/stubs.php
+++ b/setup/test/tests/stubs.php
@@ -38,6 +38,7 @@ class ReflectionClass {
     function getMethods() {}
     function getConstants() {}
     function newInstanceArgs() {}
+    function newInstanceWithoutConstructor() {}
 }
 
 class DomNode {
@@ -140,6 +141,7 @@ class SqlExpression {
 }
 
 class SqlInterval {
+    static function SECOND() {}
     static function MINUTE() {}
     static function DAY() {}
 }