Tweaks for deployment prep