Switch to latest version of PAV; fix ID mapping