Fixes to the Protocol