diff --git a/servers/slapd/bind.c b/servers/slapd/bind.c
index 7784711182..0e1d4d0576 100644
--- a/servers/slapd/bind.c
+++ b/servers/slapd/bind.c
@@ -28,7 +28,8 @@ do_bind(
 )
 {
 	BerElement	*ber = op->o_ber;
-	int		version, method;
+	int		version;
+	unsigned long method;
 	char		*cdn, *ndn;
 	unsigned long	rc;
 	struct berval	cred;
diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index fd75a314f6..f6c756cb76 100644
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -153,7 +153,7 @@ static Connection* connection_get( int s )
 #ifndef HAVE_WINSOCK
 	assert( connections[s].c_struct_state == SLAP_C_USED );
 	assert( connections[s].c_conn_state != SLAP_C_INVALID );
-	assert( !ber_pvt_sb_in_use( connections[i].c_sb ) );
+	assert( ber_pvt_sb_in_use( connections[s].c_sb ) );
 
 	c = &connections[s];
 #else