diff --git a/ChangeLog b/ChangeLog
index b46c847..06f1036 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,10 @@
    * Option to set the Curve preference order
    * Support for RSASSA-PSS keys and signatures in certificates, CSRs
      and CRLs
+   * Single Platform compatilibity layer (for memory / printf / fprintf)
+
+Changes
+   * Deprecated the Memory layer
 
 Bugfix
    * ecp_gen_keypair() does more tries to prevent failure because of
diff --git a/include/polarssl/config.h b/include/polarssl/config.h
index b191e31..cff5741 100644
--- a/include/polarssl/config.h
+++ b/include/polarssl/config.h
@@ -1445,6 +1445,7 @@
  * \def POLARSSL_MEMORY_C
  * Deprecated since 1.3.5. Please use POLARSSL_PLATFORM_MEMORY instead.
  */
+//#define POLARSSL_MEMORY_C
 
 /**
  * \def POLARSSL_MEMORY_BUFFER_ALLOC_C
diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index b4ab550..4e42c0b 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -236,6 +236,8 @@
     const ecp_curve_info *info;
 #if defined(POLARSSL_SSL_SET_CURVES)
     const ecp_group_id *grp_id;
+#else
+    ((void) ssl);
 #endif
 
     *olen = 0;