trivial conformance fixes.