Changes to skin handling