Fix up spans