diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalDiscoverer.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalDiscoverer.java
index edb5dea8ca5..997d754a326 100755
--- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalDiscoverer.java
+++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalDiscoverer.java
@@ -92,10 +92,11 @@ public class BareMetalDiscoverer extends DiscovererBase implements Discoverer, R
 	public Map<? extends ServerResource, Map<String, String>> find(long dcId, Long podId, Long clusterId, URI url, String username, String password, List<String> hostTags)
 			throws DiscoveryException {
 	    
+		/* Enable this after we decide to use addBaremetalHostCmd instead of addHostCmd
 	    String discoverName = _params.get(ApiConstants.BAREMETAL_DISCOVER_NAME);
 	    if (!this.getClass().getName().equals(discoverName)) {
 	        return null;
-	    }
+	    } */
 	    
 		Map<BareMetalResourceBase, Map<String, String>> resources = new HashMap<BareMetalResourceBase, Map<String, String>>();
 		Map<String, String> details = new HashMap<String, String>();
diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java
index 5a3997149ab..ae2165a5565 100755
--- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java
+++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalTemplateAdapter.java
@@ -85,10 +85,6 @@ public class BareMetalTemplateAdapter extends TemplateAdapterBase implements Tem
 			}
 		}
 
-        // Check that the resource limit for secondary storage won't be exceeded
-        _resourceLimitMgr.checkResourceLimit(_accountMgr.getAccount(cmd.getEntityOwnerId()),
-                ResourceType.secondary_storage, UriUtils.getRemoteSize(profile.getUrl()));
-
 		return profile;
 	}
 
@@ -125,8 +121,6 @@ public class BareMetalTemplateAdapter extends TemplateAdapterBase implements Tem
 		}
 
 		_resourceLimitMgr.incrementResourceCount(profile.getAccountId(), ResourceType.template);
-        _resourceLimitMgr.incrementResourceCount(profile.getAccountId(), ResourceType.secondary_storage,
-                UriUtils.getRemoteSize(profile.getUrl()));
 		return template;
 	}
 
diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpElement.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpElement.java
index fdf8b63b2ff..96d702d7501 100755
--- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpElement.java
+++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpElement.java
@@ -168,12 +168,14 @@ public class BaremetalDhcpElement extends AdapterBase implements DhcpServiceProv
 
     @Override
     public boolean configDhcpSupportForSubnet(Network network, NicProfile nic, VirtualMachineProfile<? extends VirtualMachine> vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, InsufficientCapacityException, ResourceUnavailableException {
-        return false;  //To change body of implemented methods use File | Settings | File Templates.
+    	//TODO Add support for baremetal
+        return true;
     }
 
     @Override
     public boolean removeDhcpSupportForSubnet(Network network) {
-        return false;  //To change body of implemented methods use File | Settings | File Templates.
+    	//TODO Add support for baremetal
+        return true;
     }
 
 }