Minor tweaks for production