Fixing cross-browser issues