more fixes for spanners & import