Fixing Deployment Issues