Minor messages improvements