Fixed some PvP issues