Chrome support fixes