More skinning upgrades