Fixes for chrome