[MIE-1290] Changes suggested by ben on PR