minor fixes to annotations