[TIMOB-12590]Fixing minor issues.