Deployment Fixes