XE5 cosmetic fixes