[PM] fix lots of issues