[TIMOB-13697] Small tweaks.