Fix bugs after webView split

Seems like the webView split caused some bugs, fixing these now.