Some more design fixes.