Demo update, fix fastscroll on 2.1