[TIMOB-13709] Bug fixes