[TIMOB-11869] Fixed some small bugs.