Minor corrections for CVE-2016-1531 backport