diff --git a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
index d2201b94b9b..28d9f97399a 100755
--- a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -575,7 +575,7 @@ public class VirtualRoutingResource implements Manager {
             s_logger.warn("Incoming public ip address is overriden.  Will always be using the same ip address: " + _publicIpAddress);
         }
 
-        _firewallPath = findScript("firewall.sh");
+        _firewallPath = findScript("call_firewall.sh");
         if (_firewallPath == null) {
             throw new ConfigurationException("Unable to find the firewall.sh");
         }
diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java
index efe8b62a527..ecc5d4c4c22 100644
--- a/server/src/com/cloud/server/ConfigurationServerImpl.java
+++ b/server/src/com/cloud/server/ConfigurationServerImpl.java
@@ -162,22 +162,16 @@ public class ConfigurationServerImpl implements ConfigurationServer {
 				}
 			}
 			
-			if (_configDao.isPremium()) {		
-				// Default value is set as KVM because of FOSS build, when we are
-				// running under premium, autoset to XenServer if we know it is from FOSS settings
-				
-				_configDao.update("secondary.storage.vm", "true");
-				s_logger.debug("ConfigurationServer made secondary storage vm required.");
-				
-				_configDao.update("secstorage.encrypt.copy", "true");
-				s_logger.debug("ConfigurationServer made secondary storage copy encrypted.");
-				
-				_configDao.update("secstorage.secure.copy.cert", "realhostip");
-				s_logger.debug("ConfigurationServer made secondary storage copy use realhostip.");					          	         
-			} else {
-				/*FOSS release, make external DHCP mode as default*/
-				_configDao.update("direct.attach.network.externalIpAllocator.enabled", "true");
-			}
+		
+			_configDao.update("secondary.storage.vm", "true");
+			s_logger.debug("ConfigurationServer made secondary storage vm required.");
+
+			_configDao.update("secstorage.encrypt.copy", "true");
+			s_logger.debug("ConfigurationServer made secondary storage copy encrypted.");
+
+			_configDao.update("secstorage.secure.copy.cert", "realhostip");
+			s_logger.debug("ConfigurationServer made secondary storage copy use realhostip.");          
+
 			
 			// Save Direct Networking service offerings
 			createServiceOffering(User.UID_SYSTEM, "Small Instance", 1, 512, 500, "Small Instance, $0.05 per hour", false, false, false, null);