sync up with management spi changes and other fixes