Improved location of annotations.