Two fixes for scrolling. Thanks Ken.