Annotation - minor fixes