QAART-265 fixes per @Bognix cr