Fix PM-mapper Vulnerabilities