Fixes for CVE-2006-6235