Minor design changes.