Fix some issues with scrolling callbacks
Small changes