diff --git a/ext/pgsql/tests/pg_fetch_object_with_abstract_class.phpt b/ext/pgsql/tests/pg_fetch_object_with_abstract_class.phpt
index d04e66a043b8..b3e6ea7f7b36 100644
--- a/ext/pgsql/tests/pg_fetch_object_with_abstract_class.phpt
+++ b/ext/pgsql/tests/pg_fetch_object_with_abstract_class.phpt
@@ -4,7 +4,7 @@ pg_fetch_object() with abstract class name
 pgsql
 --SKIPIF--
 <?php
-include("skipif.inc");
+include("inc/skipif.inc");
 ?>
 --FILE--
 <?php
@@ -17,7 +17,7 @@ enum E {
 	case A;
 }
 
-include "config.inc";
+include "inc/config.inc";
 $table_name = "pg_fetch_object_abstract_class";
 $db = pg_connect($conn_str);
 pg_query($db, "CREATE TABLE {$table_name} (a integer, b text)");
@@ -49,7 +49,7 @@ try {
 ?>
 --CLEAN--
 <?php
-include('config.inc');
+include('inc/config.inc');
 $db = @pg_connect($conn_str);
 @pg_query($db, "DROP TABLE IF EXISTS pg_fetch_object_abstract_class cascade");
 ?>
diff --git a/ext/random/engine_mt19937.c b/ext/random/engine_mt19937.c
index 7c9d1741d81f..f2cb2fd7e9bc 100644
--- a/ext/random/engine_mt19937.c
+++ b/ext/random/engine_mt19937.c
@@ -324,17 +324,16 @@ PHP_METHOD(Random_Engine_Mt19937, __serialize)
 	array_init(return_value);
 
 	/* members */
-	ZVAL_ARR(&t, zend_std_get_properties(&engine->std));
-	Z_TRY_ADDREF(t);
+	ZVAL_EMPTY_ARRAY(&t);
 	zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &t);
 
 	/* state */
 	array_init(&t);
+	zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &t);
 	if (!engine->engine.algo->serialize(engine->engine.state, Z_ARRVAL(t))) {
 		zend_throw_exception(NULL, "Engine serialize failed", 0);
 		RETURN_THROWS();
 	}
-	zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &t);
 }
 /* }}} */