Annotation tweaks