diff --git a/app/admin-tab/auth/github/controller.js b/app/admin-tab/auth/github/controller.js
index dbe1e5baa..be9156470 100644
--- a/app/admin-tab/auth/github/controller.js
+++ b/app/admin-tab/auth/github/controller.js
@@ -136,8 +136,8 @@ export default Ember.Controller.extend({
 
       let model = this.get('model');
       model.setProperties({
-        'clientId': model.get('clientId').trim(),
-        'clientSecret': model.get('clientSecret').trim(),
+        'clientId': (model.get('clientId')||'').trim(),
+        'clientSecret': (model.get('clientSecret')||'').trim(),
         'enabled': false, // It should already be, but just in case..
         'accessMode': 'unrestricted',
         'allowedIdentities': [],
diff --git a/app/components/dynamic-driver-settings/component.js b/app/components/dynamic-driver-settings/component.js
index 9e6901897..d6dc572b0 100644
--- a/app/components/dynamic-driver-settings/component.js
+++ b/app/components/dynamic-driver-settings/component.js
@@ -5,7 +5,8 @@ import FilterState from 'ui/mixins/filter-state';
 export default Ember.Component.extend(FilterState, Sortable, {
   drivers         : null,
   settings        : Ember.inject.service(),
-  sortableContent : Ember.computed.alias('drivers'),
+  filterableContent : Ember.computed.alias('drivers'),
+  sortableContent : Ember.computed.alias('filtered'),
   sortBy          : 'name',
 
   classNames      : ['machine-drivers'],
diff --git a/app/components/volume-row/template.hbs b/app/components/volume-row/template.hbs
index 4a25b0c0c..05bc68ee4 100644
--- a/app/components/volume-row/template.hbs
+++ b/app/components/volume-row/template.hbs
@@ -3,10 +3,10 @@
 </td>
 
 <td>
-  <div class="clip with-zeroclip">
+  <div class="clip">
     {{model.displayUri}}
+    {{copy-to-clipboard clipboardText=model.displayUri class="with-clip" size="small"}}
   </div>
-  {{copy-to-clipboard clipboardText=model.displayUri class="with-clip"}}
 </td>
 
 <td>
diff --git a/app/utils/filtered-sorted-array-proxy.js b/app/utils/filtered-sorted-array-proxy.js
index dd090ea04..ac003209b 100644
--- a/app/utils/filtered-sorted-array-proxy.js
+++ b/app/utils/filtered-sorted-array-proxy.js
@@ -14,8 +14,6 @@ export default Ember.ArrayProxy.extend({
   _boundFn: null,
 
   init() {
-    this._super();
-
     if ( !this.get('sortProperties') )
     {
       this.set('sortProperties', ['displayName','name','id']);
@@ -31,7 +29,8 @@ export default Ember.ArrayProxy.extend({
     });
 
     this.set('_boundFn', this.get('filterFn').bind(this));
-    this.sourceContentChanged();
+    this.updateContent();
+    this._super();
   },
 
   sourceContentChanged() {