Fix cross browswer issues