Small fixes for Deployment.