diff --git a/src/rdkafka_conf.c b/src/rdkafka_conf.c
index 92f3cb5fc..c11cda928 100644
--- a/src/rdkafka_conf.c
+++ b/src/rdkafka_conf.c
@@ -56,7 +56,7 @@
 #include <windows.h>
 #endif
 
-#ifdef WITH_OAUTHBEARER_OIDC
+#if WITH_OAUTHBEARER_OIDC
 #include <curl/curl.h>
 #endif
 
diff --git a/src/rdkafka_sticky_assignor.c b/src/rdkafka_sticky_assignor.c
index 6141a23a7..b3b388c40 100644
--- a/src/rdkafka_sticky_assignor.c
+++ b/src/rdkafka_sticky_assignor.c
@@ -4200,8 +4200,8 @@ setupRackAwareAssignment0(rd_kafka_t *rk,
             rd_kafka_metadata_get_internal(*metadata));
 
         for (i = 0; initialize_members && i < member_cnt; i++) {
-                char member_id[10];
-                snprintf(member_id, 10, "consumer%d", (int)(i + 1));
+                char member_id[11];
+                snprintf(member_id, 11, "consumer%d", (int)(i + 1));
                 ut_init_member_with_rack(
                     &members[i], member_id, ALL_RACKS[consumer_racks[i]],
                     subscriptions[i], subscriptions_count[i]);