Some changes to hopefully not get stuck on PL.