Bunch of conformance fixes: