Make zone checking more aggressive to counter false-positives