Update for some 7.1/LibPass compatibility.