diff --git a/server/src/com/cloud/api/ApiServer.java b/server/src/com/cloud/api/ApiServer.java
index c9634ce3f64..c8041776897 100644
--- a/server/src/com/cloud/api/ApiServer.java
+++ b/server/src/com/cloud/api/ApiServer.java
@@ -324,6 +324,7 @@ public class ApiServer implements HttpRequestHandler {
                     Class<?> cmdClass = Class.forName(cmdClassName);
                     BaseCmd cmdObj = (BaseCmd)cmdClass.newInstance();
 
+                    cmdObj.setResponseType(responseType);
                     // This is where the command is either serialized, or directly dispatched
                     response = queueCommand(cmdObj, paramMap);
                 } else {
diff --git a/server/src/com/cloud/api/ApiServlet.java b/server/src/com/cloud/api/ApiServlet.java
index f92a9d61d21..a4d11c568ae 100644
--- a/server/src/com/cloud/api/ApiServlet.java
+++ b/server/src/com/cloud/api/ApiServlet.java
@@ -285,8 +285,8 @@ public class ApiServlet extends HttpServlet {
                 while (attrNames.hasMoreElements()) {
                     String attrName = (String)attrNames.nextElement();
                     Object attrObj = session.getAttribute(attrName);
-                    if (attrObj instanceof String) {
-                        sb.append(", \"" + attrName + "\" : \"" + (String)attrObj + "\"");
+                    if ((attrObj instanceof String) || (attrObj instanceof Long)) {
+                        sb.append(", \"" + attrName + "\" : \"" + attrObj.toString() + "\"");
                     }
                 }
             }
diff --git a/server/src/com/cloud/api/commands/ListSystemVMsCmd.java b/server/src/com/cloud/api/commands/ListSystemVMsCmd.java
index c50e1a886af..b2331872fd5 100644
--- a/server/src/com/cloud/api/commands/ListSystemVMsCmd.java
+++ b/server/src/com/cloud/api/commands/ListSystemVMsCmd.java
@@ -35,7 +35,7 @@ import com.cloud.vm.SecondaryStorageVmVO;
 import com.cloud.vm.SystemVm;
 import com.cloud.vm.VMInstanceVO;
 
-@Implementation(method="searchForSystemVms")
+@Implementation(method="searchForSystemVm")
 public class ListSystemVMsCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListSystemVMsCmd.class.getName());