Small design fixes.
Minor fixes again.