Fix some returns
Improve scroll detection