diff --git a/ChangeLog b/ChangeLog
index 020c6d3..b1a1ffe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+08/02/2024
+- correct error log upon mismatch in "iss" claim: id_token->JWT
+
 06/24/2024
 - allow to use local file through file:// protocol for metadata or jwks; see #51; thanks @pladen
 - bump to 1.6.4dev
diff --git a/include/oauth2/nginx.h b/include/oauth2/nginx.h
index 394189f..a9dce8d 100644
--- a/include/oauth2/nginx.h
+++ b/include/oauth2/nginx.h
@@ -116,6 +116,7 @@
 
 // commands
 
+// clang-format off
 #define OAUTH2_NGINX_CMD(take, module, directive, primitive)                   \
 	{                                                                      \
 		ngx_string(directive),                                         \
@@ -124,6 +125,7 @@
 		    ngx_##module##_set_##primitive, NGX_HTTP_LOC_CONF_OFFSET,  \
 		    0, NULL                                                    \
 	}
+// clang-format on
 
 // logging
 
diff --git a/src/cfg_int.h b/src/cfg_int.h
index 040df1a..dae1899 100644
--- a/src/cfg_int.h
+++ b/src/cfg_int.h
@@ -314,7 +314,8 @@ typedef struct oauth2_cfg_openidc_t {
 		dst = type##_init(log);
 
 #define _OAUTH2_CFG_CTX_CLONE_END                                              \
-	end : return dst;                                                      \
+	end:                                                                   \
+	return dst;                                                            \
 	}
 
 #define _OAUTH2_CFG_CTX_FREE_START(type)                                       \
diff --git a/src/jose.c b/src/jose.c
index 871ebf4..8b769e2 100644
--- a/src/jose.c
+++ b/src/jose.c
@@ -1080,7 +1080,7 @@ _oauth2_jose_jwt_validate_iss(oauth2_log_t *log, const json_t *json_payload,
 	if (strcmp(iss, value) != 0) {
 		oauth2_error(log,
 			     "requested issuer (%s) does not match received "
-			     "\"%s\" value in id_token (%s)",
+			     "\"%s\" value in JWT (%s)",
 			     iss, OAUTH2_JOSE_JWT_ISS, value);
 		goto end;
 	}