Fixed some bugs in the pvp_system