Fix ordering of message codes