More cross-browser fixes