More conformance fixes