Deployment fixes made