Makes the messages conform to the spec a little better.