diff --git a/src/parse.c b/src/parse.c
index 138f1024..c4f4c21d 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -131,7 +131,7 @@ parse(struct Client *client_p, char *pbuffer, char *bufend)
 	struct Message *mptr;
 
 	s_assert(MyConnect(client_p));
-	s_assert(client_p->localClient->F->fd >= 0);
+	s_assert(client_p->localClient->F != NULL);
 	if(IsAnyDead(client_p))
 		return;
 
diff --git a/src/substitution.c b/src/substitution.c
index 37fc3404..708dce23 100644
--- a/src/substitution.c
+++ b/src/substitution.c
@@ -35,6 +35,7 @@
 
 #include "stdinc.h"
 #include "s_user.h"
+#include "snomask.h"
 #include "match.h"
 #include "substitution.h"