[TIMOB-14978] Bug fixes.