Some design fixes