Fixing e10s compatibility bugs