diff --git a/build/developer.xml b/build/developer.xml
index 0928e48dfd6..77d760b2af7 100755
--- a/build/developer.xml
+++ b/build/developer.xml
@@ -169,11 +169,18 @@
       <available file="${setup.db.dir}/override/templates.xenserver.sql" />
     </condition>
 
+    <condition property="vmware.templates.file" value="override/templates.vmware.sql" else="templates.vmware.sql">
+      <available file="${setup.db.dir}/override/templates.vmware.sql" />
+    </condition>
 
-    <condition property="templates.file" value="${kvm.templates.file}" else="${xenserver.templates.file}" >
+    <condition property="templates.file.intermediate" value="${kvm.templates.file}" else="${xenserver.templates.file}" >
       <isset property="KVM"/>
     </condition>
 
+    <condition property="templates.file" value="${vmware.templates.file}" else="${templates.file.intermediate}" >
+      <isset property="vmware"/>
+    </condition>
+  	
     <echo message="deploydb ${server-setup.file} ${templates.file} ${DBROOTPW}" />
     <exec dir="${setup.db.dir}" executable="bash">
       <arg value="deploy-db-dev.sh" />
diff --git a/server/src/com/cloud/servlet/ConsoleProxyServlet.java b/server/src/com/cloud/servlet/ConsoleProxyServlet.java
index 03372cbd82a..2c364122854 100644
--- a/server/src/com/cloud/servlet/ConsoleProxyServlet.java
+++ b/server/src/com/cloud/servlet/ConsoleProxyServlet.java
@@ -282,6 +282,7 @@ public class ConsoleProxyServlet extends HttpServlet {
 	
 	private void sendResponse(HttpServletResponse resp, String content) {
 		try {
+			resp.setContentType("text/html");
 			resp.getWriter().print(content);
 		} catch(IOException e) {
 			if(s_logger.isInfoEnabled())
diff --git a/setup/db/templates.xenserver.sql b/setup/db/templates.xenserver.sql
index 5ecd912f575..0432c97716f 100644
--- a/setup/db/templates.xenserver.sql
+++ b/setup/db/templates.xenserver.sql
@@ -72,6 +72,4 @@ INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES (58,
 INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES (59, 7, 'Other install media', 'Ubuntu');
 INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES (60, 7, 'Other install media', 'Other');
 
--- temporarily added for vmware, will be moved when vmware support is fully in-place
-INSERT INTO `cloud`.`host_master`(`type`, `service_address`, `admin`, `password`) VALUES('VSphere', 'vsphere-1.lab.vmops.com', 'Administrator', 'Suite219');