Tweaks for deployment