Some more design fixes