minor annotation tweaks