diff --git a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
index aa29740bcfe..53741b9b35c 100644
--- a/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
+++ b/server/src/com/cloud/network/firewall/FirewallManagerImpl.java
@@ -585,7 +585,7 @@ public class FirewallManagerImpl implements FirewallService, FirewallManager, Ma
 
         for (FirewallRuleVO rule : fwRules) {
             // Mark all Firewall rules as Revoke, but don't revoke them yet - we have to revoke all rules for ip, no
-// need to send them one by one
+            // need to send them one by one
             revokeFirewallRule(rule.getId(), false, caller, Account.ACCOUNT_ID_SYSTEM);
         }
 
diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
index e3db7c1c486..d89351069da 100644
--- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
@@ -776,7 +776,6 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian
 
         finalizeSshAndVersionAndNetworkUsageOnStart(cmds, profile, router, controlNic);
         
-        
         //2) FORM PLUG NIC COMMANDS
         Map<Nic, Network> guestNics = new HashMap<Nic, Network>();
         Map<Nic, Network> publicNics = new HashMap<Nic, Network>();
@@ -894,14 +893,13 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian
             throw new CloudRuntimeException("Cannot find related provider of virtual router provider: " + vrProvider.getType().toString());
         }
 
-        List<Long> routerGuestNtwkIds = _routerDao.getRouterNetworks(router.getId());
-        for (Long guestNetworkId : routerGuestNtwkIds) {
+        for (Nic nic : guestNics.keySet()) {
             if (reprogramGuestNtwks) {
-                finalizeIpAssocForNetwork(cmds, router, provider, guestNetworkId);
-                finalizeNetworkRulesForNetwork(cmds, router, provider, guestNetworkId);
+                finalizeIpAssocForNetwork(cmds, router, provider, nic.getNetworkId());
+                finalizeNetworkRulesForNetwork(cmds, router, provider, nic.getNetworkId());
             }
 
-            finalizeUserDataAndDhcpOnStart(cmds, router, provider, guestNetworkId);
+            finalizeUserDataAndDhcpOnStart(cmds, router, provider, nic.getNetworkId());
         }
   
         return true;