--- rxvt-unicode/src/screen.C	2011/07/08 20:54:31	1.390
+++ rxvt-unicode/src/screen.C	2011/09/01 08:11:27	1.394
@@ -646,7 +646,7 @@
 
       // sever bottommost line
       {
-        line_t &l = ROW(row2 - 1);
+        line_t &l = ROW(row2);
         l.is_longer (0);
         l.touch ();
       }
@@ -763,11 +763,10 @@
 
       // sever bottommost line
       {
-        line_t &l = ROW(row2 - 1);
+        line_t &l = ROW(row2);
         l.is_longer (0);
         l.touch ();
       }
-
     }
 
   return count;
@@ -2566,7 +2565,7 @@
         XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
       else
         XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
-      scrollBar.state = STATE_IDLE;
+      scrollBar.state = SB_STATE_IDLE;
       scrollBar.show (0);
     }