Various updates/fixes to the Protocol