Some minor design changes.