Fixing safari scroll issue, a lot of debuging commits are likely to be coming