bryan fixes to skins post merges