Fixes to annotator