diff --git a/lib/bind9/check.c b/lib/bind9/check.c
index d044cde7b3..2b597373c2 100644
--- a/lib/bind9/check.c
+++ b/lib/bind9/check.c
@@ -1772,7 +1772,7 @@ check_update_policy(const cfg_obj_t *policy, isc_log_t *logctx) {
 
 typedef struct {
 	const char *name;
-	int allowed;
+	unsigned int allowed;
 } optionstable;
 
 static isc_result_t
diff --git a/lib/isc/include/isc/socket.h b/lib/isc/include/isc/socket.h
index 6ace9b4882..574de2a6d6 100644
--- a/lib/isc/include/isc/socket.h
+++ b/lib/isc/include/isc/socket.h
@@ -9,8 +9,6 @@
  * information regarding copyright ownership.
  */
 
-/* $Id$ */
-
 #ifndef ISC_SOCKET_H
 #define ISC_SOCKET_H 1
 
@@ -259,7 +257,7 @@ struct isc_socket_connev {
  * _DSCP:	The UDP DSCP value is valid.
  * _USEMINMTU:	Set the per packet IPV6_USE_MIN_MTU flag.
  */
-#define ISC_SOCKEVENTATTR_ATTACHED		0x80000000U /* internal */
+#define ISC_SOCKEVENTATTR_ATTACHED		0x10000000U /* internal */
 #define ISC_SOCKEVENTATTR_TRUNC			0x00800000U /* public */
 #define ISC_SOCKEVENTATTR_CTRUNC		0x00400000U /* public */
 #define ISC_SOCKEVENTATTR_TIMESTAMP		0x00200000U /* public */