diff --git a/configs/config-ccm-psk-tls1_2.h b/configs/config-ccm-psk-tls1_2.h
index 1c7c4b44c..0c6d128c9 100644
--- a/configs/config-ccm-psk-tls1_2.h
+++ b/configs/config-ccm-psk-tls1_2.h
@@ -37,9 +37,10 @@
 
 /*
  * You should adjust this to the exact number of sources you're using: default
- * is the "platform_entrpy_poll" source, but you may want to add other ones
+ * is the "platform_entropy_poll" source, but you may want to add other ones
+ * Minimum is 2 for the entropy test suite.
  */
-#define ENTROPY_MAX_SOURCES 1
+#define ENTROPY_MAX_SOURCES 2
 
 /*
  * Save RAM at the expense of interoperability: do this only if you control
diff --git a/configs/config-suite-b.h b/configs/config-suite-b.h
index 8a98b9de1..4651e0df2 100644
--- a/configs/config-suite-b.h
+++ b/configs/config-suite-b.h
@@ -72,7 +72,7 @@
 
 /*
  * You should adjust this to the exact number of sources you're using: default
- * is the "platform_entrpy_poll" source, but you may want to add other ones.
+ * is the "platform_entropy_poll" source, but you may want to add other ones.
  * Minimum is 2 for the entropy test suite.
  */
 #define ENTROPY_MAX_SOURCES 2
diff --git a/library/pkparse.c b/library/pkparse.c
index 3c8063fe7..29217a28a 100644
--- a/library/pkparse.c
+++ b/library/pkparse.c
@@ -62,12 +62,12 @@
 #define polarssl_free       free
 #endif
 
+#if defined(POLARSSL_FS_IO)
 /* Implementation that should never be optimized out by the compiler */
 static void polarssl_zeroize( void *v, size_t n ) {
     volatile unsigned char *p = v; while( n-- ) *p++ = 0;
 }
 
-#if defined(POLARSSL_FS_IO)
 /*
  * Load all data from a file into a given buffer.
  */