Fixed PM issues