R4: Fix remaining scrollbar issues