span fixes