CON-1445 code review fixes