VID-1912 Code review fixes