Fixing the issues in Chrome