Tweaks to deployment