More skin fixes