General PvP fix