Fix pkg audit -F after -4/-6 merge