Tweaks for production