minor improvements to annotations apis