Tweaks for prod env