Correct use of Annotate in a few places