Tweaks for 2pc.