Minor tweaks for prod environment