Further fixes for chrome