diff --git a/ext/intl/tests/formatter/currencies.phpt b/ext/intl/tests/formatter/currencies.phpt
index 01c64a0480d37..1293283e7fc2b 100644
--- a/ext/intl/tests/formatter/currencies.phpt
+++ b/ext/intl/tests/formatter/currencies.phpt
@@ -1,6 +1,6 @@
 --TEST--
 NumberFormatter: currency formatting
-----DESCRIPTION--
+--DESCRIPTION--
 Tests NumberFormatter with various currenct-related formatters.
 --EXTENSIONS--
 intl
diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
index 58d7157e91d32..82165afd353db 100644
--- a/ext/simplexml/simplexml.c
+++ b/ext/simplexml/simplexml.c
@@ -2028,7 +2028,7 @@ PHP_METHOD(SimpleXMLElement, key)
 	}
 
 	curnode = intern->node->node;
-	RETURN_STRINGL((char*)curnode->name, xmlStrlen(curnode->name));
+	RETURN_STRINGL_FAST((char*)curnode->name, xmlStrlen(curnode->name));
 }
 /* }}} */
 
diff --git a/ext/xml/compat.c b/ext/xml/compat.c
index ea72a958006e2..21184be87182b 100644
--- a/ext/xml/compat.c
+++ b/ext/xml/compat.c
@@ -452,8 +452,12 @@ XML_ParserCreate_MM(const XML_Char *encoding, const XML_Memory_Handling_Suite *m
 		return NULL;
 	}
 
+#if LIBXML_VERSION >= 21300
+	xmlCtxtSetOptions(parser->parser, XML_PARSE_OLDSAX | XML_PARSE_NOENT);
+#else
 	php_libxml_sanitize_parse_ctxt_options(parser->parser);
 	xmlCtxtUseOptions(parser->parser, XML_PARSE_OLDSAX | XML_PARSE_NOENT);
+#endif
 
 	parser->parser->wellFormed = 0;
 	if (sep != NULL) {