diff --git a/stepmania/src/crypto51/algparam.h b/stepmania/src/crypto51/algparam.h
index 999998d88f..23b3aa48f0 100644
--- a/stepmania/src/crypto51/algparam.h
+++ b/stepmania/src/crypto51/algparam.h
@@ -23,7 +23,7 @@ public:
 	}
 	template <class T> ConstByteArrayParameter(const T &string, bool deepCopy = false)
 	{
-		CRYPTOPP_COMPILE_ASSERT(sizeof(string[0])==1);
+		//CRYPTOPP_COMPILE_ASSERT(sizeof(string[0])==1);
 		Assign((const byte *)string.data(), string.size(), deepCopy);
 	}
 
diff --git a/stepmania/src/crypto51/cryptlib.cpp b/stepmania/src/crypto51/cryptlib.cpp
index fd4c0475ee..5e545f54e6 100644
--- a/stepmania/src/crypto51/cryptlib.cpp
+++ b/stepmania/src/crypto51/cryptlib.cpp
@@ -11,13 +11,12 @@
 
 NAMESPACE_BEGIN(CryptoPP)
 
-CRYPTOPP_COMPILE_ASSERT(sizeof(byte) == 1);
-CRYPTOPP_COMPILE_ASSERT(sizeof(word16) == 2);
-CRYPTOPP_COMPILE_ASSERT(sizeof(word32) == 4);
-#ifdef WORD64_AVAILABLE
-CRYPTOPP_COMPILE_ASSERT(sizeof(word64) == 8);
-#endif
-CRYPTOPP_COMPILE_ASSERT(sizeof(dword) == 2*sizeof(word));
+//CRYPTOPP_COMPILE_ASSERT(sizeof(byte) == 1);
+//CRYPTOPP_COMPILE_ASSERT(sizeof(word32) == 4);
+//#ifdef WORD64_AVAILABLE
+//CRYPTOPP_COMPILE_ASSERT(sizeof(word64) == 8);
+//#endif
+//CRYPTOPP_COMPILE_ASSERT(sizeof(dword) == 2*sizeof(word));
 
 const std::string BufferedTransformation::NULL_CHANNEL;
 const NullNameValuePairs g_nullNameValuePairs;
diff --git a/stepmania/src/crypto51/fltrimpl.h b/stepmania/src/crypto51/fltrimpl.h
index a35e68b0a6..25e66e7fae 100644
--- a/stepmania/src/crypto51/fltrimpl.h
+++ b/stepmania/src/crypto51/fltrimpl.h
@@ -34,7 +34,11 @@
 	}
 
 #define FILTER_OUTPUT(site, output, length, messageEnd)	\
-	FILTER_OUTPUT2(site, 0, output, length, messageEnd)
+	{\
+	case site:	\
+	if (Output(site, output, length, messageEnd, blocking))	\
+		return STDMAX(1U, (unsigned int)length-m_inputPosition);\
+	}
 
 #define FILTER_OUTPUT_BYTE(site, output)	\
 	FILTER_OUTPUT(site, &(const byte &)(byte)output, 1, 0)
diff --git a/stepmania/src/crypto51/iterhash.cpp b/stepmania/src/crypto51/iterhash.cpp
index 00cc12bcd4..d11baa17f8 100644
--- a/stepmania/src/crypto51/iterhash.cpp
+++ b/stepmania/src/crypto51/iterhash.cpp
@@ -7,9 +7,10 @@
 NAMESPACE_BEGIN(CryptoPP)
 
 template <class T, class BASE>
-IteratedHashBase<T, BASE>::IteratedHashBase(unsigned int blockSize, unsigned int digestSize)
-	: m_data(blockSize/sizeof(T)), m_digest(digestSize/sizeof(T))
-	, m_countHi(0), m_countLo(0)
+IteratedHashBase<T, BASE>::IteratedHashBase(unsigned int blockSize,
+					    unsigned int digestSize)
+    : m_data(blockSize/sizeof(T)), m_digest(digestSize/sizeof(T)),
+      m_countLo(0), m_countHi(0)
 {
 }
 
diff --git a/stepmania/src/crypto51/misc.h b/stepmania/src/crypto51/misc.h
index 1e341e2594..153eabd4a2 100644
--- a/stepmania/src/crypto51/misc.h
+++ b/stepmania/src/crypto51/misc.h
@@ -193,8 +193,8 @@ std::string IntToString(T a, unsigned int base = 10)
 template <class T1, class T2>
 inline T1 SaturatingSubtract(T1 a, T2 b)
 {
-	CRYPTOPP_COMPILE_ASSERT_INSTANCE(T1(-1)>0, 0);	// T1 is unsigned type
-	CRYPTOPP_COMPILE_ASSERT_INSTANCE(T2(-1)>0, 1);	// T2 is unsigned type
+	//CRYPTOPP_COMPILE_ASSERT_INSTANCE(T1(-1)>0, 0);	// T1 is unsigned type
+	//CRYPTOPP_COMPILE_ASSERT_INSTANCE(T2(-1)>0, 1);	// T2 is unsigned type
 	return T1((a > b) ? (a - b) : 0);
 }