Improved standard conformance