Layout: Minor fixes.