Minor design fixes