Some cosmetic fixes.