--- a/MIME_headers.c
+++ b/MIME_headers.c
@@ -2957,7 +2957,7 @@
 
 	// Initialise header defects array.
 	hinfo->header_defect_count = 0;
-	memset(hinfo->defects, 0, _MIMEH_DEFECT_ARRAY_SIZE);
+	memset(hinfo->defects, 0, sizeof(hinfo->defects[0]) * _MIMEH_DEFECT_ARRAY_SIZE);
 
 	snprintf( hinfo->content_type_string, _MIMEH_CONTENT_TYPE_MAX , "text/plain" ); 
 
--- a/pldstr.c
+++ b/pldstr.c
@@ -297,7 +297,7 @@
 
 	result = st->start;
 
-	if ((st->start)&&(st->start != '\0'))
+	if ((st->start)&&(*(st->start) != '\0'))
 	{
 		stop = strpbrk( st->start, delimeters ); /* locate our next delimeter */
 
--- a/ripOLE/pldstr.c
+++ b/ripOLE/pldstr.c
@@ -297,7 +297,7 @@
 
 	result = st->start;
 
-	if ((st->start)&&(st->start != '\0'))
+	if ((st->start)&&(*(st->start) != '\0'))
 	{
 		stop = strpbrk( st->start, delimeters ); /* locate our next delimeter */