QAART-209 fixes per @Bognix and @justnpT