System message improvements