diff --git a/include/class.forms.php b/include/class.forms.php
index 6f28d71f98dbf476523733f75c87bcaf3b5251fd..f9c5d2258cbb612e740c42ca667748972f954710 100644
--- a/include/class.forms.php
+++ b/include/class.forms.php
@@ -2641,7 +2641,7 @@ class PriorityField extends ChoiceField {
 }
 FormField::addFieldTypes(/*@trans*/ 'Dynamic Fields', function() {
     return array(
-        'priority' => array(__('Priority Level'), PriorityField),
+        'priority' => array(__('Priority Level'), 'PriorityField'),
     );
 });
 
@@ -2812,7 +2812,7 @@ class DepartmentField extends ChoiceField {
 }
 FormField::addFieldTypes(/*@trans*/ 'Dynamic Fields', function() {
     return array(
-        'department' => array(__('Department'), DepartmentField),
+        'department' => array(__('Department'), 'DepartmentField'),
     );
 });
 
@@ -3000,7 +3000,7 @@ class AssigneeField extends ChoiceField {
 }
 FormField::addFieldTypes(/*@trans*/ 'Dynamic Fields', function() {
     return array(
-        'assignee' => array(__('Assignee'), AssigneeField),
+        'assignee' => array(__('Assignee'), 'AssigneeField'),
     );
 });
 
@@ -3090,7 +3090,7 @@ class TicketStateField extends ChoiceField {
 }
 FormField::addFieldTypes('Dynamic Fields', function() {
     return array(
-        'state' => array('Ticket State', TicketStateField, false),
+        'state' => array('Ticket State', 'TicketStateField', false),
     );
 });
 
@@ -3149,7 +3149,7 @@ class TicketFlagField extends ChoiceField {
 
 FormField::addFieldTypes('Dynamic Fields', function() {
     return array(
-        'flags' => array('Ticket Flags', TicketFlagField, false),
+        'flags' => array('Ticket Flags', 'TicketFlagField', false),
     );
 });
 
diff --git a/include/class.list.php b/include/class.list.php
index dbda898deedf46e5d65f209c213aa3108187b9be..b504d1bb94437b15ff973555ef73a209df3a31bf 100644
--- a/include/class.list.php
+++ b/include/class.list.php
@@ -522,7 +522,7 @@ class DynamicList extends VerySimpleModel implements CustomList {
         foreach (DynamicList::objects() as $list) {
             $selections['list-'.$list->id] =
                 array($list->getPluralName(),
-                    SelectionField, $list->get('id'));
+                    'SelectionField', $list->get('id'));
         }
         return $selections;
     }
diff --git a/scp/js/scp.js b/scp/js/scp.js
index e016087d3bfb0fb13260e7500736f6c40eb0535c..5092f7175aad8a9b8aa565df83775f53d9cbab00 100644
--- a/scp/js/scp.js
+++ b/scp/js/scp.js
@@ -193,6 +193,8 @@ var scp_prep = function() {
         }
      });
 
+    $('form select#cannedResp').select2({width: '300px'});
+
     $('form select#cannedResp').change(function() {
 
         var fObj = $(this).closest('form');