more pvp fixes