Fixes CVE-2014-3830 and CVE-2014-3978