fixes for chrome support