Fix a few incorrect annotations