Fix bugs in Chrome