Tiny fixes in messaging protocol