Fixes for Skin workflow