[TIMOB-10752] Small bug fixes.