Fixed partial refactoring gone wrong on some SPI files