[TIMOB-15739]Fixing minor bugs