more span fixes