Fix cves (#2085)