Fixes for multiple CVEs