conformance fixes