More annotation fixes