Fix order of message structs to enable compilation.