More tweaks for mwc2013 deployment.