Tweaks from round 2.