Some cosmetic fixes