Correct messages passed to the server