More improvements in handling messages.