Fixed chrome issues