Fix PvP and minor speed improvement