Re: Cosmetic fixes