[TIMOB-16052] More bug fixes.