some management spi changes and other fixes