diff --git a/common/compat.c b/common/compat.c
index f4a113eb..6b39a7b3 100644
--- a/common/compat.c
+++ b/common/compat.c
@@ -332,7 +332,7 @@ p11_dl_error (void)
 			MAKELANGID (LANG_NEUTRAL, SUBLANG_DEFAULT),
 			(LPSTR)&msg_buf, 0, NULL);
 
-	if (msg_buf == NULL);
+	if (msg_buf == NULL)
 		return NULL;
 
 	result = strdup (msg_buf);
diff --git a/common/lexer.c b/common/lexer.c
index 1c82a5eb..e5bc3e4e 100644
--- a/common/lexer.c
+++ b/common/lexer.c
@@ -230,19 +230,19 @@ p11_lexer_msg (p11_lexer *lexer,
 
 	switch (lexer->tok_type) {
 	case TOK_FIELD:
-		p11_message ("%s:%zu: %s: %s", lexer->filename, lexer->line,
+		p11_message ("%s:%lu: %s: %s", lexer->filename, lexer->line,
 		             lexer->tok.field.name, msg);
 		break;
 	case TOK_SECTION:
-		p11_message ("%s:%zu: [%s]: %s", lexer->filename, lexer->line,
+		p11_message ("%s:%lu: [%s]: %s", lexer->filename, lexer->line,
 		             lexer->tok.section.name, msg);
 		break;
 	case TOK_PEM:
-		p11_message ("%s:%zu: BEGIN ...: %s", lexer->filename,
+		p11_message ("%s:%lu: BEGIN ...: %s", lexer->filename,
 			     lexer->line, msg);
 		break;
 	default:
-		p11_message ("%s:%zu: %s", lexer->filename, lexer->line, msg);
+		p11_message ("%s:%lu: %s", lexer->filename, lexer->line, msg);
 		break;
 	}
 
diff --git a/p11-kit/rpc-client.c b/p11-kit/rpc-client.c
index 19b628b1..1a69d0a8 100644
--- a/p11-kit/rpc-client.c
+++ b/p11-kit/rpc-client.c
@@ -788,7 +788,7 @@ rpc_C_Initialize (CK_X_FUNCTION_LIST *self,
 		if (ret != CKR_OK) {
 			assert (module->vtable->disconnect != NULL);
 			(module->vtable->disconnect) (module->vtable, reserved);
-			ret = (module->vtable->connect) (module->vtable, reserved);
+			(module->vtable->connect) (module->vtable, reserved);
 
 			module->version = 0;
 			ret = (module->vtable->authenticate) (module->vtable,