Tweaking for deployment