diff --git a/include/class.staff.php b/include/class.staff.php
index d420ca6dab918bdc2c8d60e14f3be4287473086a..63b87d9884d3e1b532c5b1fe3dbca171552d3a57 100644
--- a/include/class.staff.php
+++ b/include/class.staff.php
@@ -368,71 +368,6 @@ implements AuthenticatedUser {
         return ($deptId && in_array($deptId, $this->getDepts()) && !$this->isAccessLimited());
     }
 
-<<<<<<< HEAD
-    function canCreateTickets() {
-        return $this->group->can_create_tickets;
-    }
-
-    function canEditTickets() {
-        return $this->group->can_edit_tickets;
-    }
-
-    function canDeleteTickets() {
-        return $this->group->can_delete_tickets;
-    }
-
-    function canCloseTickets() {
-        return $this->group->can_close_tickets;
-    }
-
-    function canPostReply() {
-        return $this->group->can_post_ticket_reply;
-    }
-
-    function canViewStaffStats() {
-        return $this->group->can_view_staff_stats;
-    }
-
-    function canAssignTickets() {
-        return $this->group->can_assign_tickets;
-    }
-
-    function canTransferTickets() {
-        return $this->group->can_transfer_tickets;
-    }
-
-    function canBanEmails() {
-        return $this->group->can_ban_emails;
-    }
-
-    function canManageTickets() {
-        return ($this->isAdmin()
-                 || $this->canDeleteTickets()
-                    || $this->canCloseTickets());
-    }
-
-    function canManagePremade() {
-        return $this->group->can_manage_premade;
-    }
-
-    function canManageCannedResponses() {
-        return $this->canManagePremade();
-    }
-
-    function canManageFAQ() {
-        return $this->group->can_manage_faq;
-    }
-
-    function canManageFAQs() {
-        return $this->canManageFAQ();
-    }
-
-    function showAssignedTickets() {
-        return $this->show_assigned_tickets;
-    }
-
-=======
->>>>>>> 5847307... roles : Implement role-based access system-wide
     function getTeams() {
 
         if (!isset($this->_teams)) {
diff --git a/include/class.ticket.php b/include/class.ticket.php
index 38f751a15a81acc12015e26dbe1866348790061a..a7722507cff8f1d7c91b19d36dc03bb62a46e7a2 100644
--- a/include/class.ticket.php
+++ b/include/class.ticket.php
@@ -2891,7 +2891,7 @@ class Ticket {
         }
 
         // Update the estimated due date in the database
-        $this->updateEstDueDate();
+        $ticket->updateEstDueDate();
 
         /**********   double check auto-response  ************/
         //Override auto responder if the FROM email is one of the internal emails...loop control.
diff --git a/include/i18n/en_US/department.yaml b/include/i18n/en_US/department.yaml
index 1ad9aa4c963bea220616063e86d333074cc9097a..3de7de70b6a2965679f39a870e80460516d04206 100644
--- a/include/i18n/en_US/department.yaml
+++ b/include/i18n/en_US/department.yaml
@@ -29,7 +29,7 @@
 
 - id: 3
   name: Maintenance
-  dept_signature: |
+  signature: |
     Maintenance Department
   ispublic: 0
   group_membership: 0
diff --git a/include/i18n/en_US/group.yaml b/include/i18n/en_US/group.yaml
index 9354e343edc2add4fd535115349faef1e2911558..c48f1c2e577da9a1c5575b122e48bf00a78ec6fc 100644
--- a/include/i18n/en_US/group.yaml
+++ b/include/i18n/en_US/group.yaml
@@ -34,7 +34,7 @@
   depts: [1, 2, 3]
 
 - id: 3
-  role_id: 3
+  role_id: 2
   flags: 1
   name: Flea Trainers
   notes: |
diff --git a/setup/inc/class.installer.php b/setup/inc/class.installer.php
index 153c5c6019b3cb28baf34d8f2075eb397d914ce5..7831cb65d953118e04d98edec18aac9708a30512 100644
--- a/setup/inc/class.installer.php
+++ b/setup/inc/class.installer.php
@@ -159,16 +159,16 @@ class Installer extends SetupWizard {
 
             Signal::send('system.install', $this);
 
-            $sql='SELECT `id` FROM '.TABLE_PREFIX.'sla ORDER BY `id` LIMIT 1';
+            $sql='SELECT `id` FROM `'.TABLE_PREFIX.'sla` ORDER BY `id` LIMIT 1';
             $sla_id_1 = db_result(db_query($sql, false));
 
-            $sql='SELECT `dept_id` FROM '.TABLE_PREFIX.'department ORDER BY `dept_id` LIMIT 1';
+            $sql='SELECT `id` FROM `'.TABLE_PREFIX.'department` ORDER BY `id` LIMIT 1';
             $dept_id_1 = db_result(db_query($sql, false));
 
-            $sql='SELECT `tpl_id` FROM '.TABLE_PREFIX.'email_template_group ORDER BY `tpl_id` LIMIT 1';
+            $sql='SELECT `tpl_id` FROM `'.TABLE_PREFIX.'email_template_group` ORDER BY `tpl_id` LIMIT 1';
             $template_id_1 = db_result(db_query($sql, false));
 
-            $sql='SELECT `group_id` FROM '.TABLE_PREFIX.'groups ORDER BY `group_id` LIMIT 1';
+            $sql='SELECT `id` FROM `'.TABLE_PREFIX.'group` ORDER BY `id` LIMIT 1';
             $group_id_1 = db_result(db_query($sql, false));
 
             //Create admin user.
diff --git a/setup/test/tests/stubs.php b/setup/test/tests/stubs.php
index 4a1f8db340525ffe775fda0d2a29c9e2a120a4ff..dbd057d515db677b957cd3d8345ad26872ecebd8 100644
--- a/setup/test/tests/stubs.php
+++ b/setup/test/tests/stubs.php
@@ -126,6 +126,7 @@ class SqlFunction {
 
 class SqlExpression {
     static function plus() {}
+    static function times() {}
     static function bitor() {}
     static function bitand() {}
 }