add external annotator fixes