Annotations fixes