More attempts at speed fixes