diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
index 9574d26d153..c843537cbb4 100644
--- a/ext/reflection/php_reflection.c
+++ b/ext/reflection/php_reflection.c
@@ -1119,7 +1119,7 @@ static void reflection_property_factory(zend_class_entry *ce, zend_property_info
 	zend_u_unmangle_property_name(utype, prop->name, prop->name_length, &class_name, &prop_name);
 	
 	if (!(prop->flags & ZEND_ACC_PRIVATE)) {
-		/* we have to seach the class hierarchy for this (implicit) public or protected property */
+		/* we have to search the class hierarchy for this (implicit) public or protected property */
 		zend_class_entry *tmp_ce = ce;
 		zend_property_info *tmp_info;
 		int prop_name_len = UG(unicode) ? u_strlen(prop_name.u) : strlen(prop_name.s);
@@ -3783,7 +3783,7 @@ ZEND_METHOD(reflection_property, __construct)
 	}
 	
 	if (!(property_info->flags & ZEND_ACC_PRIVATE)) {
-		/* we have to seach the class hierarchy for this (implicit) public or protected property */
+		/* we have to search the class hierarchy for this (implicit) public or protected property */
 		zend_class_entry *tmp_ce = ce;
 		zend_property_info *tmp_info;
 		
@@ -4424,8 +4424,7 @@ ZEND_END_ARG_INFO()
 
 static zend_function_entry reflection_function_abstract_functions[] = {
 	ZEND_ME(reflection, __clone, NULL, ZEND_ACC_PRIVATE|ZEND_ACC_FINAL)
-	ZEND_ME(reflection_function, __construct, arginfo_reflection_function___construct, 0)
-	ZEND_ME(reflection_function, __toString, NULL, 0)
+	PHP_ABSTRACT_ME(reflection_function, __toString, NULL)
 	ZEND_ME(reflection_function, isInternal, NULL, 0)
 	ZEND_ME(reflection_function, isUserDefined, NULL, 0)
 	ZEND_ME(reflection_function, getName, NULL, 0)
@@ -4445,6 +4444,8 @@ static zend_function_entry reflection_function_abstract_functions[] = {
 };
 
 static zend_function_entry reflection_function_functions[] = {
+	ZEND_ME(reflection_function, __construct, arginfo_reflection_function___construct, 0)
+	ZEND_ME(reflection_function, __toString, NULL, 0)
 	ZEND_ME(reflection_function, export, arginfo_reflection_function_export, ZEND_ACC_STATIC|ZEND_ACC_PUBLIC)
 	ZEND_ME(reflection_function, isDisabled, NULL, 0)
 	ZEND_ME(reflection_function, invoke, arginfo_reflection_function_invoke, 0)
@@ -4533,7 +4534,7 @@ ZEND_END_ARG_INFO()
 
 static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_reflection_class_getMethods, 0, 0, 0)
-	ZEND_ARG_INFO(0, $filter)
+	ZEND_ARG_INFO(0, filter)
 ZEND_END_ARG_INFO()
 
 static