Parcel SPI changes

Changes copied from Colac Otway for improved SPI generation