Some annotation updates