bug fixes for spot export