System messages improvements