More improvements to deployment.