Minor design fixes.