QAART-194 fixes per justnpT and bognix