Merge in skin fixes from b968e441a6d34b6fa1bce427d64c2b7a36c18160