Tweaks for production serving