QAART-182 code review fixes per justnpT and ukaka