Deployment code fixes