QAART-137 fixes after justnpT code review