Forgot some changes from previous commit.

Also fixed fast scrolling in list views