Made the ESP spi handling consistent.