diff --git a/src/webui/www/private/scripts/client.js b/src/webui/www/private/scripts/client.js
index 4d5fab9c9..5b612aeea 100644
--- a/src/webui/www/private/scripts/client.js
+++ b/src/webui/www/private/scripts/client.js
@@ -130,8 +130,8 @@ let toggleFilterDisplay = function() {};
 window.addEventListener("DOMContentLoaded", function() {
     const saveColumnSizes = function() {
         const filters_width = $('Filters').getSize().x;
-        const properties_height_rel = $('propertiesPanel').getSize().y / Window.getSize().y;
         LocalPreferences.set('filters_width', filters_width);
+        const properties_height_rel = $('propertiesPanel').getSize().y / Window.getSize().y;
         LocalPreferences.set('properties_height_rel', properties_height_rel);
     };
 
@@ -149,11 +149,7 @@ window.addEventListener("DOMContentLoaded", function() {
     MochaUI.Desktop.initialize();
 
     const buildTransfersTab = function() {
-        let filt_w = LocalPreferences.get('filters_width');
-        if ($defined(filt_w))
-            filt_w = filt_w.toInt();
-        else
-            filt_w = 120;
+        const filt_w = Number(LocalPreferences.get('filters_width', 120));
         new MochaUI.Column({
             id: 'filtersColumn',
             placement: 'left',
@@ -161,7 +157,6 @@ window.addEventListener("DOMContentLoaded", function() {
             width: filt_w,
             resizeLimit: [1, 300]
         });
-
         new MochaUI.Column({
             id: 'mainColumn',
             placement: 'main'
@@ -1350,7 +1345,7 @@ window.addEventListener("DOMContentLoaded", function() {
         height: null
     });
     let prop_h = LocalPreferences.get('properties_height_rel');
-    if ($defined(prop_h))
+    if (prop_h !== null)
         prop_h = prop_h.toFloat() * Window.getSize().y;
     else
         prop_h = Window.getSize().y / 2.0;
diff --git a/src/webui/www/private/scripts/piecesbar.js b/src/webui/www/private/scripts/piecesbar.js
index ae98dda00..d5835217c 100644
--- a/src/webui/www/private/scripts/piecesbar.js
+++ b/src/webui/www/private/scripts/piecesbar.js
@@ -60,8 +60,8 @@ window.qBittorrent.PiecesBar = (() => {
                 'borderColor': 'var(--color-border-default)'
             };
 
-            if (parameters && ($type(parameters) === 'object'))
-                $extend(vals, parameters);
+            if (parameters && (typeOf(parameters) === 'object'))
+                Object.append(vals, parameters);
             vals.height = Math.max(vals.height, 12);
 
             const obj = new Element('div', {
@@ -73,7 +73,7 @@ window.qBittorrent.PiecesBar = (() => {
                 }
             });
             obj.vals = vals;
-            obj.vals.pieces = $pick(pieces, []);
+            obj.vals.pieces = [pieces, []].pick();
 
             obj.vals.canvas = new Element('canvas', {
                 'id': vals.id + '_canvas',
diff --git a/src/webui/www/private/scripts/progressbar.js b/src/webui/www/private/scripts/progressbar.js
index e42fef110..676ba435a 100644
--- a/src/webui/www/private/scripts/progressbar.js
+++ b/src/webui/www/private/scripts/progressbar.js
@@ -44,7 +44,7 @@ window.qBittorrent.ProgressBar = (function() {
         initialize: function(value, parameters) {
             const vals = {
                 'id': 'progressbar_' + (ProgressBars++),
-                'value': $pick(value, 0),
+                'value': [value, 0].pick(),
                 'width': 0,
                 'height': 0,
                 'darkbg': 'var(--color-background-blue)',
@@ -52,8 +52,8 @@ window.qBittorrent.ProgressBar = (function() {
                 'lightbg': 'var(--color-background-default)',
                 'lightfg': 'var(--color-text-default)'
             };
-            if (parameters && ($type(parameters) === 'object'))
-                $extend(vals, parameters);
+            if (parameters && (typeOf(parameters) === 'object'))
+                Object.append(vals, parameters);
             if (vals.height < 12)
                 vals.height = 12;
             const obj = new Element('div', {
@@ -68,7 +68,7 @@ window.qBittorrent.ProgressBar = (function() {
                 }
             });
             obj.vals = vals;
-            obj.vals.value = $pick(value, 0); // Fix by Chris
+            obj.vals.value = [value, 0].pick();
             obj.vals.dark = new Element('div', {
                 'id': vals.id + '_dark',
                 'class': 'progressbar_dark',