Some SPI LLP protocol fixes