Fix false positives and hidden bug