Fix autoscroll and re-enable