Fix some false positives introduced in commit:15e5dd9