[TIMOB-13118] Bug fixes