Improve cross-browser support