more tweaks for prod