Fixes to the annotator