Deployment bug fixes