Cosmetic fixes.
Small fixes.