diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 0c1dcd0613f..1eb86b677ff 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -5781,6 +5781,15 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
                 	Set<Network.Service> requiredServices = element.getCapabilities().keySet();
                 	if (requiredServices.contains(Network.Service.Gateway)) {
                 		requiredServices.remove(Network.Service.Gateway);
+                	} 
+                	
+                	//Remove firewall from the list of services-to-compare
+                	if (requiredServices.contains(Network.Service.Firewall)) {
+                		requiredServices.remove(Network.Service.Firewall);
+                	}
+                	
+                	if (enabledServices.contains(Network.Service.Firewall)) {
+                		enabledServices.remove(Network.Service.Firewall);
                 	}
                 	
                 	//exclude gateway service
diff --git a/server/src/com/cloud/network/element/ExternalDhcpElement.java b/server/src/com/cloud/network/element/ExternalDhcpElement.java
index c8b1df6d8f2..64f4f04e5b0 100644
--- a/server/src/com/cloud/network/element/ExternalDhcpElement.java
+++ b/server/src/com/cloud/network/element/ExternalDhcpElement.java
@@ -72,8 +72,9 @@ public class ExternalDhcpElement extends AdapterBase implements NetworkElement,
 	}
 
     private static Map<Service, Map<Capability, String>> setCapabilities() {
+    	//No external dhcp support for Acton release
         Map<Service, Map<Capability, String>> capabilities = new HashMap<Service, Map<Capability, String>>();
-        capabilities.put(Service.Dhcp, null);
+//        capabilities.put(Service.Dhcp, null);
         return capabilities;
     }
     
diff --git a/server/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java b/server/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
index e55be5a1be8..3eaf2bfd7f5 100644
--- a/server/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
+++ b/server/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
@@ -253,10 +253,11 @@ public class JuniperSRXExternalFirewallElement extends ExternalFirewallDeviceMan
         firewallCapabilities.put(Capability.TrafficStatistics, "per public ip");
         capabilities.put(Service.Firewall, firewallCapabilities);
         
-        // Set VPN capabilities
-        Map<Capability, String> vpnCapabilities = new HashMap<Capability, String>();
-        vpnCapabilities.put(Capability.SupportedVpnTypes, "ipsec");
-        capabilities.put(Service.Vpn, vpnCapabilities);
+        //Disabling VPN for Juniper in Acton as it 1) Was never tested 2) probably just doesn't work
+//        // Set VPN capabilities
+//        Map<Capability, String> vpnCapabilities = new HashMap<Capability, String>();
+//        vpnCapabilities.put(Capability.SupportedVpnTypes, "ipsec");
+//        capabilities.put(Service.Vpn, vpnCapabilities);
         
         capabilities.put(Service.Gateway, null);