Important CVE fixes