Improve some message field names
Fix marshalling messages with missing fields