CON-1913 code review fixes after consultation