diff --git a/gnupg.c b/gnupg.c
index 4730855..1e87896 100644
--- a/gnupg.c
+++ b/gnupg.c
@@ -162,7 +162,7 @@ static void php_gnupg_this_make(PHPC_THIS_DECLARE(gnupg), zval *options TSRMLS_D
 		}
 		if (options && PHPC_HASH_CSTR_FIND_IN_COND(
 				Z_ARRVAL_P(options), "home_dir", ppv_home_dir)) {
-			home_dir = PHPC_STRVAL_P(ppv_file_name);
+			home_dir = PHPC_STRVAL_P(ppv_home_dir);
 		}
 
 		if (file_name != NULL || home_dir != NULL) {
@@ -685,7 +685,7 @@ PHP_METHOD(gnupg, __construct)
 	PHPC_THIS_DECLARE(gnupg);
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a",
-			options) == FAILURE) {
+			&options) == FAILURE) {
 		return;
 	}
 
@@ -703,7 +703,7 @@ PHP_FUNCTION(gnupg_init)
 	PHPC_THIS_DECLARE(gnupg);
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a",
-			options) == FAILURE) {
+			&options) == FAILURE) {
 		return;
 	}
 
diff --git a/tests/gnupg_oo_init_home_dir.phpt b/tests/gnupg_oo_init_home_dir.phpt
index 3aceb23..76bb1b6 100644
--- a/tests/gnupg_oo_init_home_dir.phpt
+++ b/tests/gnupg_oo_init_home_dir.phpt
@@ -15,7 +15,6 @@ $gpg->seterrormode(gnupg::ERROR_WARNING);
 $gpg->import($testkey);
 $imported = false;
 foreach (glob("$homedir/*") as $filename) {
-    //var_dump($filename);
     $imported = true;
 }
 var_dump($imported);
@@ -28,4 +27,4 @@ foreach (glob(__DIR__ . '/init_oo_home/*') as $filename) {
     unlink($filename);
 }
 rmdir($homedir);
-?>
\ No newline at end of file
+?>