Fixes for Parfait errors - annotations to tag false-positives