Fix two inconsistencies between protocol and implementation

We received two patches that fix two inconsistencies between protocol and implementation. I'll push a branch with those fixes as soon as I know the ticket number.