Fixes in annotation parser.