Some annotation improvements