Before and after make-up fixes:

Comments