Cross-browser fixes