Hacks to improve chrome compatibiltiy