Some deployment tweaks