[Protocol] Minor cosmetic changes + more external references