[Mason] Fixed several cases on SPMO