Add fixes for CVE-2008-1614