Fixing issues with Chrome