Tweaks for live deployment