diff --git a/src/www/diag_pf_info.php b/src/www/diag_pf_info.php
index a1fba694f..26afecd0e 100644
--- a/src/www/diag_pf_info.php
+++ b/src/www/diag_pf_info.php
@@ -48,7 +48,7 @@ include("head.inc");
 <body>
 <?php include("fbegin.inc"); ?>
 <script type="text/javascript">
-jQuery(document).ready(function() {setTimeout('getpfinfo()', 5000);});
+jQuery(document).ready(function() {setTimeout('getpfinfo()', 500);});
 //<![CDATA[
 	function getpfinfo() {
 		jQuery.ajax({
diff --git a/src/www/firewall_nat_npt_edit.php b/src/www/firewall_nat_npt_edit.php
index c04a605f9..31e132115 100644
--- a/src/www/firewall_nat_npt_edit.php
+++ b/src/www/firewall_nat_npt_edit.php
@@ -175,15 +175,15 @@ include("head.inc");
 											if(have_ruleint_access($if))
 												$interfaces[$if] = $ifdesc;
 
-										if ($config['l2tp']['mode'] == "server")
+										if (isset($config['l2tp']['mode']) && $config['l2tp']['mode'] == "server")
 											if(have_ruleint_access("l2tp"))
 												$interfaces['l2tp'] = "L2TP VPN";
 
-										if ($config['pptpd']['mode'] == "server")
+										if (isset($config['pptpd']['mode']) && $config['pptpd']['mode'] == "server")
 											if(have_ruleint_access("pptp"))
 												$interfaces['pptp'] = "PPTP VPN";
 
-										if ($config['pppoe']['mode'] == "server")
+										if (isset($config['pppoe']['mode']) && $config['pppoe']['mode'] == "server")
 											if(have_ruleint_access("pppoe"))
 												$interfaces['pppoe'] = "PPPoE VPN";
 
diff --git a/src/www/services_captiveportal_ip_edit.php b/src/www/services_captiveportal_ip_edit.php
index 352c1b74b..38d40eed5 100644
--- a/src/www/services_captiveportal_ip_edit.php
+++ b/src/www/services_captiveportal_ip_edit.php
@@ -31,7 +31,7 @@
 require_once("guiconfig.inc");
 require_once("captiveportal.inc");
 require_once("services.inc");
-
+require_once("interfaces.inc");
 
 function allowedipscmp($a, $b)
 {
diff --git a/src/www/services_captiveportal_zones_edit.php b/src/www/services_captiveportal_zones_edit.php
index 51584cf6c..f1bcb89f9 100644
--- a/src/www/services_captiveportal_zones_edit.php
+++ b/src/www/services_captiveportal_zones_edit.php
@@ -29,6 +29,7 @@
 require_once("guiconfig.inc");
 require_once("captiveportal.inc");
 require_once("services.inc");
+require_once("interfaces.inc");
 
 $pgtitle = array(gettext("Services"),gettext("Captive portal"),gettext("Edit Zones"));
 $shortcut_section = "captiveportal";
diff --git a/src/www/services_dnsmasq_domainoverride_edit.php b/src/www/services_dnsmasq_domainoverride_edit.php
index 6c3637481..ce3879050 100644
--- a/src/www/services_dnsmasq_domainoverride_edit.php
+++ b/src/www/services_dnsmasq_domainoverride_edit.php
@@ -29,6 +29,7 @@
 require_once("guiconfig.inc");
 require_once("services.inc");
 require_once("interfaces.inc");
+require_once("pfsense-utils.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_dnsmasq.php');
 
diff --git a/src/www/services_dnsmasq_edit.php b/src/www/services_dnsmasq_edit.php
index adfde645b..ca26b55d1 100644
--- a/src/www/services_dnsmasq_edit.php
+++ b/src/www/services_dnsmasq_edit.php
@@ -28,7 +28,7 @@
 
 require_once("guiconfig.inc");
 require_once("services.inc");
-
+require_once("interfaces.inc");
 
 function hostcmp($a, $b) {
 	return strcasecmp($a['host'], $b['host']);
diff --git a/src/www/services_rfc2136_edit.php b/src/www/services_rfc2136_edit.php
index c8c04ebf1..58244759d 100644
--- a/src/www/services_rfc2136_edit.php
+++ b/src/www/services_rfc2136_edit.php
@@ -29,6 +29,7 @@
 
 require_once("guiconfig.inc");
 require_once("services.inc");
+require_once("interfaces.inc");
 
 if (!isset($config['dnsupdates']['dnsupdate'])) {
 	$config['dnsupdates']['dnsupdate'] = array();
diff --git a/src/www/services_unbound_domainoverride_edit.php b/src/www/services_unbound_domainoverride_edit.php
index 04ef1a135..d91a7ab09 100644
--- a/src/www/services_unbound_domainoverride_edit.php
+++ b/src/www/services_unbound_domainoverride_edit.php
@@ -29,7 +29,7 @@
 
 require_once("guiconfig.inc");
 require_once("services.inc");
-
+require_once("interfaces.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_unbound.php');
 
diff --git a/src/www/services_unbound_host_edit.php b/src/www/services_unbound_host_edit.php
index a0fabfc35..bb8a9e535 100644
--- a/src/www/services_unbound_host_edit.php
+++ b/src/www/services_unbound_host_edit.php
@@ -29,6 +29,7 @@
 
 require_once("guiconfig.inc");
 require_once("services.inc");
+require_once("interfaces.inc");
 
 $referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/services_unbound.php');
 
diff --git a/src/www/status_interfaces.php b/src/www/status_interfaces.php
index 71001d0c7..95e7e01cf 100644
--- a/src/www/status_interfaces.php
+++ b/src/www/status_interfaces.php
@@ -30,6 +30,7 @@
 
 require_once("guiconfig.inc");
 require_once("system.inc");
+require_once("services.inc");
 require_once("interfaces.inc");
 require_once("pfsense-utils.inc");
 require_once("openvpn.inc");
diff --git a/src/www/system_advanced_firewall.php b/src/www/system_advanced_firewall.php
index 8569ceb62..1d10e793d 100644
--- a/src/www/system_advanced_firewall.php
+++ b/src/www/system_advanced_firewall.php
@@ -32,6 +32,7 @@
 require_once("guiconfig.inc");
 require_once("filter.inc");
 require_once("services.inc");
+require_once("system.inc");
 
 function default_table_entries_size()
 {
diff --git a/src/www/vpn_openvpn_export_shared.php b/src/www/vpn_openvpn_export_shared.php
index c09e70d49..98ea6f220 100644
--- a/src/www/vpn_openvpn_export_shared.php
+++ b/src/www/vpn_openvpn_export_shared.php
@@ -342,7 +342,7 @@ endforeach; ?>
 										<select name="useaddr" id="useaddr" class="formselect" onchange="useaddr_changed(this)">
 											<option value="serveraddr" >Interface IP Address</option>
 											<option value="serverhostname" >Installation hostname</option>
-											<?php if (is_array($config['dyndnses']['dyndns'])) :
+											<?php if (isset($config['dyndnses']['dyndns'])) :
 ?>
 												<?php foreach ($config['dyndnses']['dyndns'] as $ddns) :
 ?>
diff --git a/src/www/vpn_pppoe.php b/src/www/vpn_pppoe.php
index a25ceab43..c308397e6 100644
--- a/src/www/vpn_pppoe.php
+++ b/src/www/vpn_pppoe.php
@@ -30,6 +30,7 @@
 require_once("guiconfig.inc");
 require_once("filter.inc");
 require_once("vpn.inc");
+require_once("interfaces.inc");
 
 if (!is_array($config['pppoes'])) {
     $config['pppoes'] = array();
