More design fixes