Replace more iso8061 usages