More annotation tweaks