[IM] Tweaks from production