diff --git a/server.c b/server.c
index eeca1f8e..7d87371c 100644
--- a/server.c
+++ b/server.c
@@ -1,4 +1,4 @@
-/* $Id: server.c,v 1.141 2009-05-13 23:27:00 nicm Exp $ */
+/* $Id: server.c,v 1.142 2009-05-14 07:58:38 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -601,7 +601,7 @@ server_check_timers(struct client *c)
 	if (interval == 0)
 		return;
 	if (tv.tv_sec < c->status_timer.tv_sec ||
-	    tv.tv_sec - c->status_timer.tv_sec >= interval)
+	    ((u_int) tv.tv_sec) - c->status_timer.tv_sec >= interval)
 		c->flags |= CLIENT_STATUS;
 }
 
diff --git a/window.c b/window.c
index 07214b78..73712f4b 100644
--- a/window.c
+++ b/window.c
@@ -1,4 +1,4 @@
-/* $Id: window.c,v 1.74 2009-05-13 23:27:00 nicm Exp $ */
+/* $Id: window.c,v 1.75 2009-05-14 07:58:38 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -38,7 +38,7 @@
 #ifdef HAVE_LIBUTIL_H
 #include <libutil.h>
 #endif
-#ifdef USE_PTY_H
+#ifdef HAVE_PTY_H
 #include <pty.h>
 #endif
 #ifdef HAVE_UTIL_H