Couple tweaks for deployment.