Some skins fixes