diff --git a/src/lib/md5.c b/src/lib/md5.c
index a40e9f34c36..4c34a988a6e 100644
--- a/src/lib/md5.c
+++ b/src/lib/md5.c
@@ -164,7 +164,7 @@ void MD5Final(unsigned char digest[16], struct MD5Context *ctx)
     MD5Transform(ctx->buf, (uint32_t *) ctx->in);
     byteReverse((unsigned char *) ctx->buf, 4);
     memcpy(digest, ctx->buf, 16);
-    memset(ctx, 0, sizeof(ctx));        /* In case it's sensitive */
+    memset(ctx, 0, sizeof(MD5Context)); /* In case it's sensitive */
 }
 
 
diff --git a/src/lib/var.c b/src/lib/var.c
index 98267d45b6e..a67aacc8130 100644
--- a/src/lib/var.c
+++ b/src/lib/var.c
@@ -2408,7 +2408,7 @@ var_create(
         return VAR_RC(VAR_ERR_INVALID_ARGUMENT);
     if ((var = (var_t *)malloc(sizeof(var_t))) == NULL)
         return VAR_RC(VAR_ERR_OUT_OF_MEMORY);
-    memset(var, 0, sizeof(var));
+    memset(var, 0, sizeof(var_t));
     var_config(var, VAR_CONFIG_SYNTAX, &var_syntax_default);
     *pvar = var;
     return VAR_OK;