diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc
index c05b7af212..33d1b75ecf 100644
--- a/etc/inc/captiveportal.inc
+++ b/etc/inc/captiveportal.inc
@@ -43,8 +43,6 @@
 /* include all configuration functions */
 require_once("config.inc");
 require_once("functions.inc");
-require_once("radius_authentication.inc");
-require_once("radius_accounting.inc");
 require_once("radius.inc");
 require_once("voucher.inc");
 
diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc
index d535e2f92d..7640df444f 100644
--- a/etc/inc/upgrade_config.inc
+++ b/etc/inc/upgrade_config.inc
@@ -785,8 +785,11 @@ function upgrade_042_to_043() {
 		/* Update all filter rules which might reference this gateway */
 		$j = 0;
 		foreach($config['filter']['rule'] as $rule) {
-			if(is_ipaddr($rule['gateway']) && ($rule['gateway'] == $config['gateways']['gateway_item'][$i]['gateway'])) {
-				$config['filter']['rule'][$j]['gateway'] = $config['gateways']['gateway_item'][$i]['name'];
+			if(is_ipaddr($rule['gateway'])) {
+				if ($rule['gateway'] == $config['gateways']['gateway_item'][$i]['gateway'])
+					$config['filter']['rule'][$j]['gateway'] = $config['gateways']['gateway_item'][$i]['name'];
+				else if ($rule['gateway'] == $ifname)
+					$config['filter']['rule'][$j]['gateway'] = $config['gateways']['gateway_item'][$i]['name'];
 			}
 			$j++;
 		}
diff --git a/usr/local/captiveportal/radius_accounting.inc b/usr/local/captiveportal/radius_accounting.inc
index aea05c8ccf..e60a21724d 100644
--- a/usr/local/captiveportal/radius_accounting.inc
+++ b/usr/local/captiveportal/radius_accounting.inc
@@ -47,6 +47,8 @@ RADIUS ACCOUNTING START
 -----------------------
 */
 
+PEAR::loadExtension('bcmath');
+
 function RADIUS_ACCOUNTING_START($ruleno, $username, $sessionid, $radiusservers, $clientip, $clientmac) {
 
     global $config;
diff --git a/usr/local/www/firewall_nat_out_edit.php b/usr/local/www/firewall_nat_out_edit.php
index 56918b0eb2..45db4bae09 100755
--- a/usr/local/www/firewall_nat_out_edit.php
+++ b/usr/local/www/firewall_nat_out_edit.php
@@ -434,6 +434,10 @@ any)</td>
 		foreach ($config['virtualip']['vip'] as $sn):
 			if ($sn['mode'] == "proxyarp" && $sn['type'] == "network"):
 				$baseip = ip2long($sn['subnet']) & ip2long(gen_subnet_mask($sn['subnet_bits']));
+				$snip = long2ip($baseip);
+?>
+				<option value="<?=$snip;?>" <?php if ($snip == $pconfig['target']) echo "selected"; ?>><?=htmlspecialchars("{$snip} ({$sn['descr']})");?></option>
+<?php
 				for ($i = $sn['subnet_bits']; $i <= 32; $i++):
 					$baseip = $baseip + 1;
 					$snip = long2ip($baseip);