diff --git a/emhttp/plugins/dynamix/nchan/update_3 b/emhttp/plugins/dynamix/nchan/update_3
index b4053c8a8..d9d8be998 100755
--- a/emhttp/plugins/dynamix/nchan/update_3
+++ b/emhttp/plugins/dynamix/nchan/update_3
@@ -132,7 +132,8 @@ while (true) {
       if ($link) {
         $speed = port_get_contents("$net/$port/speed");
         $duplex = port_get_contents("$net/$port/duplex");
-        $echo['mode'][] = "$speed Mbps, $duplex duplex, mtu $mtu";
+        $speed = ($speed >= 1000) ? ($speed/1000)." Gbps" : $speed." Mbps";
+        $echo['mode'][] = "$speed, $duplex duplex, mtu $mtu";
       } else {
         $echo['mode'][] = _('interface down');
       }
diff --git a/emhttp/plugins/dynamix/scripts/system_information b/emhttp/plugins/dynamix/scripts/system_information
index 51a49378e..32433d786 100755
--- a/emhttp/plugins/dynamix/scripts/system_information
+++ b/emhttp/plugins/dynamix/scripts/system_information
@@ -117,11 +117,17 @@ foreach ($memory_array as $device) {
   if ($base>=1) $memory_maximum += $size*pow(1024,$base);
   if (!$ecc && isset($device['Error Correction Type']) && $device['Error Correction Type']!='None') $ecc = $device['Error Correction Type']." ";
 }
-if ($memory_installed >= 1024) {
+if ($memory_installed >= 1048576) {
+  $memory_installed = round($memory_installed/1048576);
+  $memory_maximum = round($memory_maximum/1048576);
+  $unit = 'TiB';
+} elseif ($memory_installed >= 1024) {
   $memory_installed = round($memory_installed/1024);
   $memory_maximum = round($memory_maximum/1024);
   $unit = 'GiB';
-} else $unit = 'MiB';
+} else {
+  $unit = 'MiB';
+}
 
 // If maximum < installed then roundup maximum to the next power of 2 size of installed. E.g. 6 -> 8 or 12 -> 16
 $low = $memory_maximum < $memory_installed;
@@ -187,7 +193,8 @@ foreach ($sPorts as $port) {
     if ($link) {
       $speed = file_get_contents("$int/speed");
       $duplex = file_get_contents("$int/duplex");
-      echo "<tr class='$more'><td>$name</td><td>$port: $speed Mbps, $duplex duplex, mtu $mtu</td></tr>";
+      $speed = ($speed >= 1000) ? ($speed/1000)." Gbps" : $speed." Mbps";
+      echo "<tr class='$more'><td>$name</td><td>$port: $speed, $duplex duplex, mtu $mtu</td></tr>";
     } else {
       echo "<tr class='$more'><td>$name</td><td>$port: ",_('interface down'),"</td></tr>";
     }