[Protocol] Wrong numeric references
[Protocol] Cosmetic changes.