SPI LLP improvements