Tweaks to deployment system