Fix some quality flaws
SONARPLUGINS-3252 Use Annotator to highlight issues