Minor design fixes3