Apply round 1 of fixes