diff --git a/plugins/dynamix/DeviceInfo.page b/plugins/dynamix/DeviceInfo.page
index 9c57e2bb8..2413c4b23 100644
--- a/plugins/dynamix/DeviceInfo.page
+++ b/plugins/dynamix/DeviceInfo.page
@@ -32,7 +32,7 @@ function presetSpace($val) {
   $units = ['KB','MB','GB','TB','PB','EB','ZB','YB'];
   $val = filter_var($val,FILTER_SANITIZE_NUMBER_INT);
   $base = $val>0 ? floor(log($val,1000)) : 0;
-  return ($val/pow(1000,$base)).' '.$units[$base];
+  return ($val/pow(1000,$base)).' '._var($units,$base);
 }
 function fsSize() {
   global $disks,$pools;
@@ -107,7 +107,7 @@ function setFloor() {
     size = val.replace(/[A-Z.,\s]/gi,'')==0 ? (Math.floor(size/base) * base).toString() : val;
     var unit = size.replace(/[0-9.,\s]/g,'');
     base = unit.length==2 ? 1000 : (unit.length==1 ? 1024 : 0);
-    $('#shareFloor').val(base>0 ? size.replace(unit,'') * Math.pow(base,units.indexOf(unit.toUpperCase().replace('B',''))) : size);
+    $('#shareFloor').val(base>0 ? size.replace(unit,'') * Math.pow(base,(units.indexOf(unit.toUpperCase().replace('B',''))||0)) : size);
   }
 }
 <?if (fsType('btrfs')):?>
diff --git a/plugins/dynamix/ShareEdit.page b/plugins/dynamix/ShareEdit.page
index 5a5030344..203e00aa8 100644
--- a/plugins/dynamix/ShareEdit.page
+++ b/plugins/dynamix/ShareEdit.page
@@ -60,7 +60,7 @@ function presetSpace($val) {
   $units = ['KB','MB','GB','TB','PB','EB','ZB','YB'];
   $val = filter_var($val,FILTER_SANITIZE_NUMBER_INT);
   $base = $val>0 ? floor(log($val,1000)) : 0;
-  return ($val/pow(1000,$base)).' '.$units[$base];
+  return ($val/pow(1000,$base)).' '._var($units,$base);
 }
 function fsSize() {
   global $disks,$pools;
@@ -454,7 +454,7 @@ function setFloor(val) {
   size = val.replace(/[A-Z.,\s]/gi,'')==0 ? (Math.floor(size/base) * base).toString() : val;
   var unit = size.replace(/[0-9.,\s]/g,'');
   base = unit.length==2 ? 1000 : (unit.length==1 ? 1024 : 0);
-  return base>0 ? size.replace(unit,'') * Math.pow(base,units.indexOf(unit.toUpperCase().replace('B',''))) : size;
+  return base>0 ? size.replace(unit,'') * Math.pow(base,(units.indexOf(unit.toUpperCase().replace('B',''))||0)) : size;
 }
 // Compose input fields
 function prepareEdit() {