diff --git a/server/src/com/cloud/api/commands/UpdateIsoCmd.java b/server/src/com/cloud/api/commands/UpdateIsoCmd.java
index a9a758509fb..3c812b50bed 100755
--- a/server/src/com/cloud/api/commands/UpdateIsoCmd.java
+++ b/server/src/com/cloud/api/commands/UpdateIsoCmd.java
@@ -19,6 +19,7 @@ package com.cloud.api.commands;
 
 import org.apache.log4j.Logger;
 
+import com.cloud.api.ApiDBUtils;
 import com.cloud.api.BaseCmd;
 import com.cloud.api.Implementation;
 import com.cloud.api.ServerApiException;
@@ -69,6 +70,7 @@ public class UpdateIsoCmd extends UpdateTemplateOrIsoCmd {
             response.setCreated(result.getCreated());
             response.setFormat(result.getFormat());
             response.setOsTypeId(result.getGuestOSId());
+            response.setOsTypeName(ApiDBUtils.findGuestOSById(result.getGuestOSId()).getDisplayName());
             response.setBootable(result.isBootable());
             response.setObjectName("iso");
             response.setResponseName(getName());
diff --git a/server/src/com/cloud/api/commands/UpdateTemplateCmd.java b/server/src/com/cloud/api/commands/UpdateTemplateCmd.java
old mode 100644
new mode 100755
index c0c40fb02fd..413678904ce
--- a/server/src/com/cloud/api/commands/UpdateTemplateCmd.java
+++ b/server/src/com/cloud/api/commands/UpdateTemplateCmd.java
@@ -19,6 +19,7 @@ package com.cloud.api.commands;
 
 import org.apache.log4j.Logger;
 
+import com.cloud.api.ApiDBUtils;
 import com.cloud.api.BaseCmd;
 import com.cloud.api.Implementation;
 import com.cloud.api.ServerApiException;
@@ -70,6 +71,7 @@ public class UpdateTemplateCmd extends UpdateTemplateOrIsoCmd {
             response.setCreated(result.getCreated());
             response.setFormat(result.getFormat());
             response.setOsTypeId(result.getGuestOSId());
+            response.setOsTypeName(ApiDBUtils.findGuestOSById(result.getGuestOSId()).getDisplayName());
             response.setPasswordEnabled(result.getEnablePassword());
             response.setCrossZones(result.isCrossZones());
             response.setObjectName("template");
diff --git a/server/src/com/cloud/api/response/TemplateResponse.java b/server/src/com/cloud/api/response/TemplateResponse.java
old mode 100644
new mode 100755
index 86f9cc46aec..86a8912c6b4
--- a/server/src/com/cloud/api/response/TemplateResponse.java
+++ b/server/src/com/cloud/api/response/TemplateResponse.java
@@ -102,7 +102,7 @@ public class TemplateResponse extends BaseResponse {
     private String domainName;  
 
     @SerializedName("domainid") @Param(description="the ID of the domain to which the template belongs")
-    private long domainId;
+    private Long domainId;
 
     public Long getZoneId() {
         return zoneId;