[TIMOB-11869] Bug fixes.