[TIMOB-13155] Fixed some issues with my earlier commits.