Little fixes in protocol