JC-1753 changes according to code review notices