Update relational fields of messages, small corrections