Fix cross browser issues