Fixed some selection/scroll issues