Multiple design fixes.