Tweaks to the detailed design.