minor changes to keep up with span dev.