QAART-295 fixes per @bognix and @justnpT code review