[TIMOB-5992]some minor changes.