Some design fixes.