Minor tweaks for production serving.