diff --git a/php_scrypt.c b/php_scrypt.c
index 9f3bba2..50df498 100644
--- a/php_scrypt.c
+++ b/php_scrypt.c
@@ -199,11 +199,11 @@ PHP_FUNCTION(scrypt)
 		php_hash_bin2hex(hex, buf, keyLength);
 		efree(buf);
 		hex[keyLength*2] = '\0';
-		RETURN_STRINGL(hex, keyLength * 2);
+		RETVAL_STRINGL(hex, keyLength * 2);
 		efree(hex);
 	} else {
 		buf[keyLength] = '\0';
-		RETURN_STRINGL((char *)buf, keyLength);
+		RETVAL_STRINGL((char *)buf, keyLength);
 		efree(buf);
 	}
 }
@@ -280,5 +280,4 @@ PHP_FUNCTION(scrypt_pickparams)
 	add_assoc_long(return_value, "n", phpN);
 	add_assoc_long(return_value, "r", phpR);
 	add_assoc_long(return_value, "p", phpP);
-	return;
 }
diff --git a/tests/scrypt_vectors.phpt b/tests/scrypt_vectors.phpt
index a2660b8..a1dd1bb 100644
--- a/tests/scrypt_vectors.phpt
+++ b/tests/scrypt_vectors.phpt
@@ -5,7 +5,7 @@ Test scrypt KDF using test vectors.
 --INI--
 memory_limit=2G
 --FILE--
-<?php 
+<?php
 echo scrypt("", "", 16, 1, 1, 64) . "\n";
 echo scrypt("password", "NaCl", 1024, 8, 16, 64) . "\n";
 echo scrypt("pleaseletmein", "SodiumChloride", 16384, 8, 1, 64) . "\n";