Fex cosmetic fixes