Some changes for deployment.