Fixes for chrome-based browsers