Updated skin fixes from 3efef130abf3f0c74bda87ace7d2fa4d30062712