Annotation fixes