Small design changes.