Minor design fixes5