Fixes for crossbrowsing