More changes to ScopeSPI 2