diff --git a/src/normal.c b/src/normal.c
index 5bd2e5ee4b..0ab3db4300 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -4560,9 +4560,9 @@ nv_mousescroll(cmdarg_T *cap)
 	    nv_scroll_line(cap);
 	}
 #ifdef FEAT_TEXT_PROP
-	if (bt_popup(wp->w_buffer))
+	if (bt_popup(curwin->w_buffer))
 	{
-	    int	    height = wp->w_height;
+	    int	    height = curwin->w_height;
 
 	    curwin->w_firstline = curwin->w_topline;
 	    popup_adjust_position(curwin);
diff --git a/src/popupwin.c b/src/popupwin.c
index 5611cba6b7..2158a8036d 100644
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -2129,8 +2129,8 @@ update_popups(void (*win_update)(win_T *wp))
     char_u  buf[MB_MAXBYTES];
     int	    row;
     int	    i;
-    int	    sb_thumb_top;
-    int	    sb_thumb_height;
+    int	    sb_thumb_top = 0;
+    int	    sb_thumb_height = 0;
     int	    attr_scroll = highlight_attr[HLF_PSB];
     int	    attr_thumb = highlight_attr[HLF_PST];
 
diff --git a/src/version.c b/src/version.c
index f74cb66db6..eada1792c7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -777,6 +777,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1599,
 /**/
     1598,
 /**/