fixes to annotation introspector