More scopeSPI changes.