More protocol.h fixes
Merge pull request #6 from amlweems/proto-fixes

More protocol.h fixes