diff --git a/TestVectors/hc128.txt b/TestVectors/hc128.txt
index ef2f8c13..95dffcdb 100644
--- a/TestVectors/hc128.txt
+++ b/TestVectors/hc128.txt
@@ -1,8 +1,5 @@
 # These test vectors were generated using the eSTREAM reference
-# implementation for HC-128 using the file hc-128.c. We could not
-# use the published test vectors because they arrived at the
-# incorrect result when plugged back into the reference
-# implementation. Sigh...
+# implementation for HC-128 using the file hc-128.c.
 
 AlgorithmType: SymmetricCipher
 Name: HC-128
diff --git a/rabbit.h b/rabbit.h
index 42a55453..177c98cb 100644
--- a/rabbit.h
+++ b/rabbit.h
@@ -48,6 +48,7 @@ protected:
 	bool CanOperateKeystream() const { return true; }
 	bool CipherIsRandomAccess() const { return false; }
 
+private:
 	// Master and working states
 	FixedSizeSecBlock<word32, 8> m_mx, m_mc, m_wx, m_wc;
 	// Workspace
@@ -66,6 +67,7 @@ protected:
 	bool CanOperateKeystream() const { return true; }
 	bool CipherIsRandomAccess() const { return false; }
 
+private:
 	// Master and working states
 	FixedSizeSecBlock<word32, 8> m_mx, m_mc, m_wx, m_wc;
 	// Workspace