diff --git a/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java b/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java
index a542e3b9ee0..02ccd973286 100755
--- a/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java
+++ b/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java
@@ -90,8 +90,8 @@ public class FirstFitAllocator implements HostAllocator {
 			ExcludeList avoid, int returnUpTo) {
 
 		long dcId = plan.getDataCenterId();
-		long podId = plan.getPodId();
-		long clusterId = plan.getClusterId();
+		Long podId = plan.getPodId();
+		Long clusterId = plan.getClusterId();
 		ServiceOffering offering = vmProfile.getServiceOffering();
 		VMTemplateVO template = (VMTemplateVO)vmProfile.getTemplate();
 
diff --git a/server/src/com/cloud/agent/manager/allocator/impl/RandomAllocator.java b/server/src/com/cloud/agent/manager/allocator/impl/RandomAllocator.java
index c61d45963c2..5c6cd863a80 100755
--- a/server/src/com/cloud/agent/manager/allocator/impl/RandomAllocator.java
+++ b/server/src/com/cloud/agent/manager/allocator/impl/RandomAllocator.java
@@ -53,8 +53,8 @@ public class RandomAllocator implements HostAllocator {
 			ExcludeList avoid, int returnUpTo) {
 
 		long dcId = plan.getDataCenterId();
-		long podId = plan.getPodId();
-		long clusterId = plan.getClusterId();
+		Long podId = plan.getPodId();
+		Long clusterId = plan.getClusterId();
 		ServiceOffering offering = vmProfile.getServiceOffering();
     	
     	List<Host> suitableHosts = new ArrayList<Host>();
diff --git a/server/src/com/cloud/storage/allocator/FirstFitStoragePoolAllocator.java b/server/src/com/cloud/storage/allocator/FirstFitStoragePoolAllocator.java
index 7b854b1619c..527a194f513 100644
--- a/server/src/com/cloud/storage/allocator/FirstFitStoragePoolAllocator.java
+++ b/server/src/com/cloud/storage/allocator/FirstFitStoragePoolAllocator.java
@@ -59,8 +59,8 @@ public class FirstFitStoragePoolAllocator extends AbstractStoragePoolAllocator {
         	return suitablePools;
         }
 		long dcId = plan.getDataCenterId();
-		long podId = plan.getPodId();
-		long clusterId = plan.getClusterId();
+		Long podId = plan.getPodId();
+		Long clusterId = plan.getClusterId();
 
         if(dskCh.getTags() != null && dskCh.getTags().length != 0){
         	s_logger.debug("Looking for pools in dc: " + dcId + "  pod:" + podId + "  cluster:" + clusterId + " having tags:" + Arrays.toString(dskCh.getTags()));
diff --git a/server/src/com/cloud/storage/allocator/RandomStoragePoolAllocator.java b/server/src/com/cloud/storage/allocator/RandomStoragePoolAllocator.java
index c7539ff4a7d..ccf67658b22 100644
--- a/server/src/com/cloud/storage/allocator/RandomStoragePoolAllocator.java
+++ b/server/src/com/cloud/storage/allocator/RandomStoragePoolAllocator.java
@@ -57,8 +57,8 @@ public class RandomStoragePoolAllocator extends AbstractStoragePoolAllocator {
         	return suitablePools;
         }
 		long dcId = plan.getDataCenterId();
-		long podId = plan.getPodId();
-		long clusterId = plan.getClusterId();
+		Long podId = plan.getPodId();
+		Long clusterId = plan.getClusterId();
         s_logger.debug("Looking for pools in dc: " + dcId + "  pod:" + podId + "  cluster:" + clusterId);
     	List<StoragePoolVO> pools = _storagePoolDao.listBy(dcId, podId, clusterId);
         if (pools.size() == 0) {