Fixed various issues wrt the messages being sent on the wire.