[PVP] Some core operational fixes