Deployment tweaks