[WOTGM-947] Minor changes.