Further messages improvements