more tweaks in prod