Remove false positives and resolve some of remaining ones.