[Mason] SPMO fixes