[TIMOB-13186] Bug fixes