Some annotation updates.