Minor design fixes4