Apply the PM tweaks to the new fork