Some design fixes and changes