Deployment-related fixes