Fixes to message format