SPI reliability improvements