diff --git a/pdcurses/slk.c b/pdcurses/slk.c
index a2535167..5975a431 100644
--- a/pdcurses/slk.c
+++ b/pdcurses/slk.c
@@ -33,7 +33,7 @@
 #undef slk_attroff
 #undef slk_color
 
-RCSID("$Id: slk.c,v 1.25 2006/07/30 06:12:45 wmcbrine Exp $");
+RCSID("$Id: slk.c,v 1.26 2006/07/30 18:57:23 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
@@ -295,20 +295,13 @@ int slk_refresh(void)
 {
 	PDC_LOG(("slk_refresh() - called\n"));
 
-	if (SP->slk_winptr == (WINDOW *)NULL)
-		return ERR;
-
-	slk_noutrefresh();
-	return doupdate();
+	return (slk_noutrefresh() == ERR) ? ERR : doupdate();
 }
 
 int slk_noutrefresh(void)
 {
 	PDC_LOG(("slk_noutrefresh() - called\n"));
 
-	if (SP->slk_winptr == (WINDOW *)NULL)
-		return ERR;
-
 	return wnoutrefresh(SP->slk_winptr);
 }
 
@@ -596,7 +589,7 @@ int PDC_mouse_in_slk(int y, int x)
 
 	for (i = 0; i < labels; i++)
 		if (x >= slk_start_col[i]
-		 && x <= slk_start_col[i] + label_length - 1)
+		 && x < slk_start_col[i] + label_length)
 			return i + 1;
 
 	return 0;
diff --git a/pdcurses/window.c b/pdcurses/window.c
index f797e5d4..e93f2fa8 100644
--- a/pdcurses/window.c
+++ b/pdcurses/window.c
@@ -43,7 +43,7 @@
 # undef wclrtobot
 #endif
 
-RCSID("$Id: window.c,v 1.33 2006/07/15 15:38:24 wmcbrine Exp $");
+RCSID("$Id: window.c,v 1.34 2006/07/30 18:57:23 wmcbrine Exp $");
 
 /*man-start**************************************************************
 
@@ -412,7 +412,7 @@ WINDOW *resize_window(WINDOW *win, int lins, int cols)
 
 	if (win == SP->slk_winptr)
 	{
-		new_begy = SP->lines-SP->slklines;
+		new_begy = SP->lines - SP->slklines;
 		new_begx = 0;
 	}
 	else