fixes to annotation