More fixes to Defacing