[spc module] fix bugs found after 2nd review