Fix annotator regressions.