diff --git a/python/lib/cloud_utils.py b/python/lib/cloud_utils.py
index f638c55f6f8..6df111c58c6 100644
--- a/python/lib/cloud_utils.py
+++ b/python/lib/cloud_utils.py
@@ -939,11 +939,11 @@ def setup_agent_config(configfile, host, zone, pod):
 				stderr("You selected zone %s pod %s",confopts["zone"],confopts["pod"])
 			else:
 				stderr("Skipped -- using the previous zone %s pod %s",confopts["zone"],confopts["pod"])
-		else:
+	    else:
 			confopts["zone"] = zone
 			confopts["pod"] = pod
 	except (urllib2.URLError,urllib2.HTTPError),e:
-		stderr("Query failed: %s.  Defaulting to zone %s pod %s",confopts["zone"],confopts["pod"])
+		stderr("Query failed: %s.  Defaulting to zone %s pod %s",str(e),confopts["zone"],confopts["pod"])
 
 	for opt,val in confopts.items():
 		line = "=".join([opt,val])
@@ -988,7 +988,7 @@ def setup_consoleproxy_config(configfile, host, zone, pod):
 			confopts["zone"] = zone
 			confopts["pod"] = pod
 	except (urllib2.URLError,urllib2.HTTPError),e:
-		stderr("Query failed: %s.  Defaulting to zone %s pod %s",e,confopts["zone"],confopts["pod"])
+		stderr("Query failed: %s.  Defaulting to zone %s pod %s",str(e),confopts["zone"],confopts["pod"])
 
 	for opt,val in confopts.items():
 		line = "=".join([opt,val])
diff --git a/wscript_build b/wscript_build
index 59e33345f80..a964c9040dd 100644
--- a/wscript_build
+++ b/wscript_build
@@ -460,7 +460,10 @@ if buildpremium:
 		bld.install_files('${SYSCONFDIR}/%s/%s'%(bld.env.PACKAGE,proj),'cloudstack-proprietary/test/conf/*')
 
 # build / install declarations of server project <- this is actually now in client project
-bld.install_files("${MSENVIRON}/webapps/client/WEB-INF",'client/WEB-INF/web.xml') # install web.xml file
+start_path = bld.path.find_dir("client/WEB-INF")
+bld.install_files('${MSENVIRON}/webapps/client/WEB-INF',
+	start_path.ant_glob("**",src=True,bld=False,dir=False,flat=True),
+	cwd=start_path,relative_trick=True)
 if not Options.options.PRESERVECONFIG:
 	bld.install_files_filtered("${SERVERSYSCONFDIR}","server/conf/*")