changes for making it work with latest spc commits