Small design fixes.