diff --git a/include/client.h b/include/client.h
index f60b16dc..4fb3de61 100644
--- a/include/client.h
+++ b/include/client.h
@@ -261,7 +261,7 @@ enum {
 #define SendRejNotice(x)	((x)->umodes & UMODE_REJ)
 #define SendSkillNotice(x)	((x)->umodes & UMODE_SKILL)
 #define SendFullNotice(x)	((x)->umodes & UMODE_FULL)
-#define SendSpyNotice(x)	((x)->umodes & UMODE_SPY)1
+#define SendSpyNotice(x)	((x)->umodes & UMODE_SPY)
 #define SendDebugNotice(x)	((x)->umodes & UMODE_DEBUG)
 #define SendNickChange(x)	((x)->umodes & UMODE_NCHANGE)
 #define SetWallops(x)		((x)->umodes |= UMODE_WALLOP)
diff --git a/libratbox/src/linebuf.c b/libratbox/src/linebuf.c
index c5472dfc..4f1d24f0 100644
--- a/libratbox/src/linebuf.c
+++ b/libratbox/src/linebuf.c
@@ -446,8 +446,6 @@ rb_linebuf_get(rb_buf_head_t * bufhead, char *buf, size_t buflen, bool partial,
 	size_t cpylen;
 	char *start, *ch;
 
-	lrb_assert(buflen > 0);
-
 	/* make sure we have a line */
 	if(bufhead->list.head == NULL)
 		return 0;	/* Obviously not.. hrm. */
diff --git a/src/listener.c b/src/listener.c
index bcf81704..4909edad 100644
--- a/src/listener.c
+++ b/src/listener.c
@@ -427,12 +427,14 @@ add_connection(struct Listener *listener, rb_fde_t * F, struct sockaddr *sai, st
 		        int saved_errno = errno;
 			log_listener("creating SSL/TLS socket pairs %s:%s",
 				     get_listener_name(listener), strerror(saved_errno));
+			rb_close(F);
 			free_client(new_client);
 			return;
 		}
 		new_client->localClient->ssl_ctl = start_ssld_accept(F, xF[1], new_client->localClient->connid);	/* this will close F for us */
 		if(new_client->localClient->ssl_ctl == NULL)
 		{
+			rb_close(F);
 			rb_close(xF[0]);
 			rb_close(xF[1]);
 			free_client(new_client);