[Mason] fixed 2 issues in PMO