diff --git a/MasterPassword/C/mpw-types.c b/MasterPassword/C/mpw-types.c
index 06d7e6f8..9b14d569 100644
--- a/MasterPassword/C/mpw-types.c
+++ b/MasterPassword/C/mpw-types.c
@@ -21,11 +21,11 @@
 
 const MPSiteType mpw_typeWithName(const char *typeName) {
 
-    // Lower-case and trim optionally leading "generated" string from typeName to standardize it.
+    // Lower-case and trim optionally leading "Generated" string from typeName to standardize it.
     size_t stdTypeNameOffset = 0;
     size_t stdTypeNameSize = strlen( typeName );
-    if (strcasestr(typeName, "generated" ) == typeName)
-        stdTypeNameSize -= (stdTypeNameOffset = strlen("generated"));
+    if (strstr(typeName, "Generated" ) == typeName)
+        stdTypeNameSize -= (stdTypeNameOffset = strlen( "Generated" ));
     char stdTypeName[stdTypeNameSize + 1];
     for (size_t c = 0; c < stdTypeNameSize; ++c)
         stdTypeName[c] = (char)tolower( typeName[c + stdTypeNameOffset] );
diff --git a/MasterPassword/C/mpw-util.h b/MasterPassword/C/mpw-util.h
index 66cb8419..52ba5f99 100644
--- a/MasterPassword/C/mpw-util.h
+++ b/MasterPassword/C/mpw-util.h
@@ -26,7 +26,7 @@
 //// Buffers and memory.
 
 #define alloc_array(_count, _type, ...) ({ \
-    _type stackElements[] = (_type[]){ __VA_ARGS__ }; \
+    _type stackElements[] = { __VA_ARGS__ }; \
     _count = sizeof( stackElements ) / sizeof( _type ); \
     _type *allocElements = malloc( sizeof( stackElements ) ); \
     memcpy( allocElements, stackElements, sizeof( stackElements ) ); \