Few tweaks for first deployments