Fix up issue with KB+ conformance test