A few post-span fixes seem to be in order