backported more annotation fixes