diff --git a/scrypt.cpp b/scrypt.cpp
index 1563444a..69aeafc7 100644
--- a/scrypt.cpp
+++ b/scrypt.cpp
@@ -19,6 +19,9 @@
 
 ANONYMOUS_NAMESPACE_BEGIN
 
+using CryptoPP::byte;
+using CryptoPP::word32;
+using CryptoPP::word64;
 using CryptoPP::rotlConstant;
 using CryptoPP::AlignedSecByteBlock;
 using CryptoPP::LITTLE_ENDIAN_ORDER;
diff --git a/scrypt.h b/scrypt.h
index ef63fb1a..d52738dc 100644
--- a/scrypt.h
+++ b/scrypt.h
@@ -60,7 +60,6 @@ public:
     /// \param cost the CPU/memory cost factor
     /// \param blockSize the block size
     /// \param parallelization the parallelization factor
-    /// \param infoLen the size of the info buffer, in bytes
     /// \returns the number of iterations performed
     /// \throws InvalidDerivedLength if <tt>derivedLen</tt> is invalid for the scheme
     /// \details DeriveKey() provides a standard interface to derive a key from
diff --git a/validat3.cpp b/validat3.cpp
index f7a377ee..404a5859 100644
--- a/validat3.cpp
+++ b/validat3.cpp
@@ -837,7 +837,7 @@ bool ValidateScrypt()
 			{ "pleaseletmein", "SodiumChloride", 16384, 8, 1, "7023bdcb3afd7348461c06cd81fd38ebfda8fbba904f8e3ea9b543f6545da1f2d5432955613f0fcf62d49705242a9af9e61e85dc0d651e40dfcf017b45575887"},
 #ifndef CRYPTOPP_DEBUG
 			// This one takes too long in debug builds
-			{ "pleaseletmein", "SodiumChloride", 1048576, 8, 1, "2101cb9b6a511aaeaddbbe09cf70f881ec568d574a2ffd4dabe5ee9820adaa478e56fd8f4ba5d09ffa1c6d927c40f4c337304049e8a952fbcbf45c6fa77a41a4"}
+			// { "pleaseletmein", "SodiumChloride", 1048576, 8, 1, "2101cb9b6a511aaeaddbbe09cf70f881ec568d574a2ffd4dabe5ee9820adaa478e56fd8f4ba5d09ffa1c6d927c40f4c337304049e8a952fbcbf45c6fa77a41a4"}
 #endif
 	};