Fix #395 CVEs added