diff --git a/core/src/com/cloud/agent/api/DeleteStoragePoolCommand.java b/core/src/com/cloud/agent/api/DeleteStoragePoolCommand.java
index 98ad6beb403..60736023929 100644
--- a/core/src/com/cloud/agent/api/DeleteStoragePoolCommand.java
+++ b/core/src/com/cloud/agent/api/DeleteStoragePoolCommand.java
@@ -35,7 +35,7 @@ public class DeleteStoragePoolCommand extends Command {
 	}
     
     public DeleteStoragePoolCommand(StoragePoolVO pool, String localPath) {
-    	this.pool = pool;
+    	this.pool = new StoragePoolVO(pool);
     	this.localPath = localPath;
     }
     
@@ -48,7 +48,7 @@ public class DeleteStoragePoolCommand extends Command {
     }
 
     public void setPool(StoragePoolVO pool) {
-        this.pool = pool;
+        this.pool = new StoragePoolVO(pool);
     }
     
 	@Override
diff --git a/core/src/com/cloud/agent/api/SecStorageFirewallCfgCommand.java b/core/src/com/cloud/agent/api/SecStorageFirewallCfgCommand.java
index 45dc67e92d9..a27cbfa95ab 100644
--- a/core/src/com/cloud/agent/api/SecStorageFirewallCfgCommand.java
+++ b/core/src/com/cloud/agent/api/SecStorageFirewallCfgCommand.java
@@ -20,6 +20,7 @@ package com.cloud.agent.api;
 
 import java.lang.reflect.Type;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 
 import org.apache.log4j.Logger;
@@ -27,6 +28,7 @@ import org.apache.log4j.Logger;
 import com.cloud.agent.transport.Request;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
@@ -59,7 +61,12 @@ public class SecStorageFirewallCfgCommand extends Command {
 	        }
 	        Gson json = s_gBuilder.create();
 	        s_logger.debug("Returning gson tree");
-	        return json.toJsonTree(src, listType);
+	        JsonArray array = new JsonArray();
+	        for (PortConfig pc : src) {
+	            array.add(json.toJsonTree(pc));
+	        }
+
+	        return array;
 	    }
 
 	    public List<PortConfig> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
@@ -68,7 +75,13 @@ public class SecStorageFirewallCfgCommand extends Command {
 	            return new ArrayList<PortConfig>();
 	        }
 	        Gson jsonp = s_gBuilder.create();
-	        List<PortConfig> pcs = jsonp.fromJson(json, listType);
+            List<PortConfig> pcs = new ArrayList<PortConfig>();
+	        JsonArray array = json.getAsJsonArray();
+	        Iterator<JsonElement> it = array.iterator();
+	        while (it.hasNext()) {
+	            JsonElement element = it.next();
+	            pcs.add(jsonp.fromJson(element, PortConfig.class));
+	        }
 	        return pcs;
 	    }