diff --git a/library/error.c b/library/error.c
index ed0f39e..1eac108 100644
--- a/library/error.c
+++ b/library/error.c
@@ -1,7 +1,7 @@
 /*
  *  Error message information
  *
- *  Copyright (C) 2006-2012, Brainspark B.V.
+ *  Copyright (C) 2006-2014, Brainspark B.V.
  *
  *  This file is part of PolarSSL (http://www.polarssl.org)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
diff --git a/library/version_features.c b/library/version_features.c
index d7d2d8f..5680341 100644
--- a/library/version_features.c
+++ b/library/version_features.c
@@ -35,12 +35,13 @@
 
 #include <string.h>
 
-#if defined(_MSC_VER) && !defined  snprintf && !defined(EFIX64) && \
+#if defined(_MSC_VER) && !defined strcasecmp && !defined(EFIX64) && \
     !defined(EFI32)
-#define  snprintf  _snprintf
+#define strcasecmp _stricmp
 #endif
 
 const char *features[] = {
+#if defined(POLARSSL_VERSION_FEATURES)
 #if defined(POLARSSL_HAVE_INT8)
     "POLARSSL_HAVE_INT8",
 #endif /* POLARSSL_HAVE_INT8 */
@@ -524,6 +525,7 @@
 #if defined(POLARSSL_XTEA_C)
     "POLARSSL_XTEA_C",
 #endif /* POLARSSL_XTEA_C */
+#endif
     NULL
 };
 
@@ -531,6 +533,9 @@
 {
     const char **idx = features;
 
+    if( *idx == NULL )
+        return( -2 );
+
     if( feature == NULL )
         return( -1 );