Fix chrome.
Fix chrome. Improve span wrapping.