Tweaks to blocks 2 and 3.