Fixes in protocol