R4: More scrollbar fixes