A few cosmetic fixes