Fix issues with Chrome for Windows