diff --git a/app/js/custom.js b/app/js/custom.js
index 7edb4187..6d295804 100644
--- a/app/js/custom.js
+++ b/app/js/custom.js
@@ -278,7 +278,9 @@ function loadChannelSelect(selected) {
         var countries_5Ghz_max48ch = data["5Ghz_max48ch"].countries;
 
         // Map selected hw_mode and country to determine channel list
-        if (($.inArray(country_code, countries_2_4Ghz_max11ch) !== -1) && (hw_mode !== 'ac') ) {
+        if (hw_mode === 'a') {
+            selectablechannels = data["5Ghz_max48ch"].channels;
+        } else if (($.inArray(country_code, countries_2_4Ghz_max11ch) !== -1) && (hw_mode !== 'ac') ) {
             selectablechannels = data["2_4GHz_max11ch"].channels;
         } else if (($.inArray(country_code, countries_2_4Ghz_max14ch) !== -1) && (hw_mode === 'b')) {
             selectablechannels = data["2_4GHz_max14ch"].channels;
diff --git a/includes/dhcp.php b/includes/dhcp.php
index 9fd7e338..2329838b 100755
--- a/includes/dhcp.php
+++ b/includes/dhcp.php
@@ -52,6 +52,7 @@ function DisplayDHCPConfig()
     exec('cat '. RASPI_DNSMASQ_PREFIX.$ap_iface.'.conf', $return);
     $conf = array_merge(ParseConfig($return));
     $hosts = (array)$conf['dhcp-host'];
+    $upstreamServers = (array)$conf['server'];
     exec("ip -o link show | awk -F': ' '{print $2}'", $interfaces);
     exec('cat ' . RASPI_DNSMASQ_LEASES, $leases);
 
@@ -63,6 +64,7 @@ function DisplayDHCPConfig()
             "ap_iface",
             "conf",
             "hosts",
+            "upstreamServers",
             "interfaces",
             "leases"
         )
@@ -178,9 +180,7 @@ function compareIPs($ip1, $ip2)
 function updateDnsmasqConfig($iface,$status)
 {
     $config = '# RaspAP '.$iface.' configuration'.PHP_EOL;
-    $config .= 'interface='.$iface.PHP_EOL.
-        'dhcp-range='.$_POST['RangeStart'].','.$_POST['RangeEnd'].
-        ',255.255.255.0,';
+    $config .= 'interface='.$iface.PHP_EOL.'dhcp-range='.$_POST['RangeStart'].','.$_POST['RangeEnd'].','.$_POST['SubnetMask'].',';
     if ($_POST['RangeLeaseTimeUnits'] !== 'infinite') {
         $config .= $_POST['RangeLeaseTime'];
     }
diff --git a/includes/hostapd.php b/includes/hostapd.php
index 3a528068..a41b320b 100755
--- a/includes/hostapd.php
+++ b/includes/hostapd.php
@@ -14,7 +14,7 @@ getWifiInterface();
 function DisplayHostAPDConfig()
 {
     $status = new StatusMessages();
-    $system = new System();
+    $system = new \RaspAP\System\Sysinfo;
     $arrConfig = array();
     $arr80211Standard = [
         'a' => '802.11a - 5 GHz',
diff --git a/yarn.lock b/yarn.lock
index 1c57657b..0b90ec2f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3291,9 +3291,9 @@ path-is-absolute@^1.0.0:
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
 path-parse@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
 path-root-regex@^0.1.0:
   version "0.1.2"