Fix false positive errors