Fix PVP glitches